diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml
index 79502ccb81d0a6468efa9c395b0565a948c63d8b..08e143070ad671d15b452541ddd5ad0fe945ef93 100644
--- a/modules/openapi-generator/pom.xml
+++ b/modules/openapi-generator/pom.xml
@@ -277,6 +277,11 @@
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.10</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index b20c113111448e671eb0d3694d274082e27528d1..28895d27de55003ffcbe17a5df050fc359d51620 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -25,11 +25,27 @@ import com.google.common.collect.ImmutableMap;
import com.samskivert.mustache.Mustache;
import com.samskivert.mustache.Mustache.Compiler;
import com.samskivert.mustache.Mustache.Lambda;
-
+import io.swagger.v3.core.util.Json;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.callbacks.Callback;
+import io.swagger.v3.oas.models.examples.Example;
+import io.swagger.v3.oas.models.headers.Header;
+import io.swagger.v3.oas.models.media.*;
+import io.swagger.v3.oas.models.parameters.*;
+import io.swagger.v3.oas.models.responses.ApiResponse;
+import io.swagger.v3.oas.models.responses.ApiResponses;
+import io.swagger.v3.oas.models.security.OAuthFlow;
+import io.swagger.v3.oas.models.security.OAuthFlows;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.servers.Server;
+import io.swagger.v3.oas.models.servers.ServerVariable;
+import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.text.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.text.StringEscapeUtils;
import org.openapitools.codegen.CodegenDiscriminator.MappedModel;
import org.openapitools.codegen.api.TemplatingEngineAdapter;
import org.openapitools.codegen.config.GlobalSettings;
@@ -61,24 +77,6 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import io.swagger.v3.core.util.Json;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.PathItem;
-import io.swagger.v3.oas.models.callbacks.Callback;
-import io.swagger.v3.oas.models.examples.Example;
-import io.swagger.v3.oas.models.headers.Header;
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.parameters.*;
-import io.swagger.v3.oas.models.responses.ApiResponse;
-import io.swagger.v3.oas.models.responses.ApiResponses;
-import io.swagger.v3.oas.models.security.OAuthFlow;
-import io.swagger.v3.oas.models.security.OAuthFlows;
-import io.swagger.v3.oas.models.security.SecurityScheme;
-import io.swagger.v3.oas.models.servers.Server;
-import io.swagger.v3.oas.models.servers.ServerVariable;
-import io.swagger.v3.parser.util.SchemaTypeUtil;
-
import static org.openapitools.codegen.utils.OnceLogger.once;
import static org.openapitools.codegen.utils.StringUtils.*;
@@ -89,7 +87,7 @@ public class DefaultCodegen implements CodegenConfig {
// A cache of sanitized words. The sanitizeName() method is invoked many times with the same
// arguments, this cache is used to optimized performance.
- private static Cache<SanitizeNameOptions, String> sanitizedNameCache;
+ private static final Cache<SanitizeNameOptions, String> sanitizedNameCache;
static {
DefaultFeatureSet = FeatureSet.newBuilder()
@@ -570,7 +568,7 @@ public class DefaultCodegen implements CodegenConfig {
parent.hasChildren = true;
Schema parentSchema = this.openAPI.getComponents().getSchemas().get(parent.name);
if (parentSchema == null) {
- throw new NullPointerException(parent.name+" in "+this.openAPI.getComponents().getSchemas());
+ throw new NullPointerException(parent.name + " in " + this.openAPI.getComponents().getSchemas());
}
if (parentSchema.getDiscriminator() == null) {
parent = allModels.get(parent.getParent());
@@ -1952,7 +1950,7 @@ public class DefaultCodegen implements CodegenConfig {
if (encoding != null) {
boolean styleGiven = true;
Encoding.StyleEnum style = encoding.getStyle();
- if(style == null || style == Encoding.StyleEnum.FORM) {
+ if (style == null || style == Encoding.StyleEnum.FORM) {
// (Unfortunately, swagger-parser-v3 will always provide 'form'
// when style is not specified, so we can't detect that)
style = Encoding.StyleEnum.FORM;
@@ -1960,12 +1958,12 @@ public class DefaultCodegen implements CodegenConfig {
}
boolean explodeGiven = true;
Boolean explode = encoding.getExplode();
- if(explode == null) {
+ if (explode == null) {
explode = style == Encoding.StyleEnum.FORM; // Default to True when form, False otherwise
explodeGiven = false;
}
- if(!styleGiven && !explodeGiven) {
+ if (!styleGiven && !explodeGiven) {
// Ignore contentType if style or explode are specified.
codegenParameter.contentType = encoding.getContentType();
}
@@ -1973,7 +1971,7 @@ public class DefaultCodegen implements CodegenConfig {
codegenParameter.style = style.toString();
codegenParameter.isDeepObject = Encoding.StyleEnum.DEEP_OBJECT == style;
- if(codegenParameter.isContainer) {
+ if (codegenParameter.isContainer) {
codegenParameter.isExplode = explode;
String collectionFormat = getCollectionFormat(codegenParameter);
codegenParameter.collectionFormat = StringUtils.isEmpty(collectionFormat) ? "csv" : collectionFormat;
@@ -2449,8 +2447,8 @@ public class DefaultCodegen implements CodegenConfig {
this.schema = s;
}
- private String name;
- private Schema schema;
+ private final String name;
+ private final Schema schema;
@Override
public boolean equals(Object o) {
@@ -2817,7 +2815,6 @@ public class DefaultCodegen implements CodegenConfig {
// referenced models here, component that refs another component which is a model
// if a component references a schema which is not a generated model, the refed schema will be loaded into
// schema by unaliasSchema and one of the above code paths will be taken
- ;
}
if (schema instanceof ComposedSchema) {
@@ -3637,7 +3634,7 @@ public class DefaultCodegen implements CodegenConfig {
}
property.baseType = getSchemaType(p);
if (p.getXml() != null) {
- property.isXmlWrapped = p.getXml().getWrapped() == null ? false : p.getXml().getWrapped();
+ property.isXmlWrapped = p.getXml().getWrapped() != null && p.getXml().getWrapped();
property.xmlPrefix = p.getXml().getPrefix();
property.xmlNamespace = p.getXml().getNamespace();
property.xmlName = p.getXml().getName();
@@ -3661,7 +3658,6 @@ public class DefaultCodegen implements CodegenConfig {
updatePropertyForAnyType(property, p);
} else if (!ModelUtils.isNullType(p)) {
// referenced model
- ;
}
boolean isAnyTypeWithNothingElseSet = (ModelUtils.isAnyType(p) &&
@@ -4706,7 +4702,7 @@ public class DefaultCodegen implements CodegenConfig {
// the default value is false
// https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#user-content-parameterexplode
- codegenParameter.isExplode = parameter.getExplode() == null ? false : parameter.getExplode();
+ codegenParameter.isExplode = parameter.getExplode() != null && parameter.getExplode();
// TODO revise collectionFormat, default collection format in OAS 3 appears to multi at least for query parameters
// https://swagger.io/docs/specification/serialization/
@@ -4735,7 +4731,6 @@ public class DefaultCodegen implements CodegenConfig {
if (ModelUtils.isShortSchema(parameterSchema)) { // int32/short format
codegenParameter.isShort = true;
} else { // unbounded integer
- ;
}
}
} else if (ModelUtils.isTypeObjectSchema(parameterSchema)) {
@@ -4747,7 +4742,6 @@ public class DefaultCodegen implements CodegenConfig {
}
addVarsRequiredVarsAdditionalProps(parameterSchema, codegenParameter);
} else if (ModelUtils.isNullType(parameterSchema)) {
- ;
} else if (ModelUtils.isAnyType(parameterSchema)) {
// any schema with no type set, composed schemas often do this
if (ModelUtils.isMapSchema(parameterSchema)) { // for map parameter
@@ -4774,7 +4768,6 @@ public class DefaultCodegen implements CodegenConfig {
}
} else {
// referenced schemas
- ;
}
CodegenProperty codegenProperty = fromProperty(parameter.getName(), parameterSchema);
@@ -4783,7 +4776,7 @@ public class DefaultCodegen implements CodegenConfig {
}
// TODO revise below which seems not working
//if (parameterSchema.getRequired() != null && !parameterSchema.getRequired().isEmpty() && parameterSchema.getRequired().contains(codegenProperty.baseName)) {
- codegenProperty.required = Boolean.TRUE.equals(parameter.getRequired()) ? true : false;
+ codegenProperty.required = Boolean.TRUE.equals(parameter.getRequired());
//}
//codegenProperty.required = true;
@@ -6443,7 +6436,6 @@ public class DefaultCodegen implements CodegenConfig {
if (ModelUtils.isShortSchema(ps)) { // int32/short format
codegenParameter.isShort = true;
} else { // unbounded integer
- ;
}
}
} else if (ModelUtils.isTypeObjectSchema(ps)) {
@@ -6451,10 +6443,8 @@ public class DefaultCodegen implements CodegenConfig {
codegenParameter.isFreeFormObject = true;
}
} else if (ModelUtils.isNullType(ps)) {
- ;
} else if (ModelUtils.isAnyType(ps)) {
// any schema with no type set, composed schemas often do this
- ;
} else if (ModelUtils.isArraySchema(ps)) {
Schema inner = getSchemaItems((ArraySchema) ps);
CodegenProperty arrayInnerProperty = fromProperty("inner", inner);
@@ -6493,7 +6483,6 @@ public class DefaultCodegen implements CodegenConfig {
}
} else {
// referenced schemas
- ;
}
if (Boolean.TRUE.equals(codegenProperty.isModel)) {
@@ -7300,9 +7289,9 @@ public class DefaultCodegen implements CodegenConfig {
return exceptions;
}
- private String name;
- private String removeCharRegEx;
- private List<String> exceptions;
+ private final String name;
+ private final String removeCharRegEx;
+ private final List<String> exceptions;
@Override
public boolean equals(Object o) {
@@ -7474,7 +7463,7 @@ public class DefaultCodegen implements CodegenConfig {
}
private CodegenComposedSchemas getComposedSchemas(Schema schema) {
- if (!(schema instanceof ComposedSchema) && schema.getNot()==null) {
+ if (!(schema instanceof ComposedSchema) && schema.getNot() == null) {
return null;
}
Schema notSchema = schema.getNot();
@@ -7534,5 +7523,7 @@ public class DefaultCodegen implements CodegenConfig {
}
@Override
- public boolean getUseInlineModelResolver() { return true; }
+ public boolean getUseInlineModelResolver() {
+ return true;
+ }
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
index cb475a64c2035eb2dc360f2c87a592bab2cc510f..e018e8b16d7b43eeee7ed7900b6efff5f49fe435 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
@@ -28,11 +28,12 @@ import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.oas.models.parameters.Parameter;
import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse;
+import io.swagger.v3.parser.ObjectMapperFactory;
import io.swagger.v3.parser.core.models.AuthorizationValue;
import io.swagger.v3.parser.util.ClasspathHelper;
-import io.swagger.v3.parser.ObjectMapperFactory;
import io.swagger.v3.parser.util.RemoteUrl;
import io.swagger.v3.parser.util.SchemaTypeUtil;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.IJsonSchemaValidationProperties;
@@ -41,18 +42,17 @@ import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.ModelsMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.commons.io.FileUtils;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.URI;
import java.net.URLDecoder;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
import static org.openapitools.codegen.utils.OnceLogger.once;
@@ -71,29 +71,30 @@ public class ModelUtils {
private static final String freeFormExplicit = "x-is-free-form";
- private static ObjectMapper JSON_MAPPER, YAML_MAPPER;
+ private static final ObjectMapper JSON_MAPPER;
+ private static final ObjectMapper YAML_MAPPER;
static {
JSON_MAPPER = ObjectMapperFactory.createJson();
YAML_MAPPER = ObjectMapperFactory.createYaml();
}
- public static void setDisallowAdditionalPropertiesIfNotPresent(boolean value) {
- GlobalSettings.setProperty(disallowAdditionalPropertiesIfNotPresent, Boolean.toString(value));
- }
-
public static boolean isDisallowAdditionalPropertiesIfNotPresent() {
return Boolean.parseBoolean(GlobalSettings.getProperty(disallowAdditionalPropertiesIfNotPresent, "true"));
}
- public static void setGenerateAliasAsModel(boolean value) {
- GlobalSettings.setProperty(generateAliasAsModelKey, Boolean.toString(value));
+ public static void setDisallowAdditionalPropertiesIfNotPresent(boolean value) {
+ GlobalSettings.setProperty(disallowAdditionalPropertiesIfNotPresent, Boolean.toString(value));
}
public static boolean isGenerateAliasAsModel() {
return Boolean.parseBoolean(GlobalSettings.getProperty(generateAliasAsModelKey, "false"));
}
+ public static void setGenerateAliasAsModel(boolean value) {
+ GlobalSettings.setProperty(generateAliasAsModelKey, Boolean.toString(value));
+ }
+
public static boolean isGenerateAliasAsModel(Schema schema) {
return isGenerateAliasAsModel() || (schema.getExtensions() != null && schema.getExtensions().getOrDefault("x-generate-alias-as-model", false).equals(true));
}
@@ -308,15 +309,15 @@ public class ModelUtils {
/**
* Invoke the specified visitor function for every schema that matches mimeType in the OpenAPI document.
- *
+ * <p>
* To avoid infinite recursion, referenced schemas are visited only once. When a referenced schema is visited,
* it is added to visitedSchemas.
*
- * @param openAPI the OpenAPI document that contains schema objects.
- * @param schema the root schema object to be visited.
- * @param mimeType the mime type. TODO: does not seem to be used in a meaningful way.
+ * @param openAPI the OpenAPI document that contains schema objects.
+ * @param schema the root schema object to be visited.
+ * @param mimeType the mime type. TODO: does not seem to be used in a meaningful way.
* @param visitedSchemas the list of referenced schemas that have been visited.
- * @param visitor the visitor function which is invoked for every visited schema.
+ * @param visitor the visitor function which is invoked for every visited schema.
*/
private static void visitSchema(OpenAPI openAPI, Schema schema, String mimeType, List<String> visitedSchemas, OpenAPISchemaVisitor visitor) {
visitor.visit(schema, mimeType);
@@ -371,12 +372,6 @@ public class ModelUtils {
}
}
- @FunctionalInterface
- private static interface OpenAPISchemaVisitor {
-
- public void visit(Schema schema, String mimeType);
- }
-
public static String getSimpleRef(String ref) {
if (ref == null) {
once(LOGGER).warn("Failed to get the schema name: null");
@@ -455,10 +450,7 @@ public class ModelUtils {
}
// must have at least one property
- if (schema.getType() == null && schema.getProperties() != null && !schema.getProperties().isEmpty()) {
- return true;
- }
- return false;
+ return schema.getType() == null && schema.getProperties() != null && !schema.getProperties().isEmpty();
}
/**
@@ -521,11 +513,7 @@ public class ModelUtils {
return true;
}
- if (schema.getAdditionalProperties() instanceof Boolean && (Boolean) schema.getAdditionalProperties()) {
- return true;
- }
-
- return false;
+ return schema.getAdditionalProperties() instanceof Boolean && (Boolean) schema.getAdditionalProperties();
}
/**
@@ -543,72 +531,52 @@ public class ModelUtils {
}
public static boolean isStringSchema(Schema schema) {
- if (schema instanceof StringSchema || SchemaTypeUtil.STRING_TYPE.equals(schema.getType())) {
- return true;
- }
- return false;
+ return schema instanceof StringSchema || SchemaTypeUtil.STRING_TYPE.equals(schema.getType());
}
public static boolean isIntegerSchema(Schema schema) {
if (schema instanceof IntegerSchema) {
return true;
}
- if (SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType())) {
- return true;
- }
- return false;
+ return SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType());
}
public static boolean isShortSchema(Schema schema) {
- if (SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) // type: integer
- && SchemaTypeUtil.INTEGER32_FORMAT.equals(schema.getFormat())) { // format: short (int32)
- return true;
- }
- return false;
+ // format: short (int32)
+ return SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) // type: integer
+ && SchemaTypeUtil.INTEGER32_FORMAT.equals(schema.getFormat());
}
public static boolean isLongSchema(Schema schema) {
- if (SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) // type: integer
- && SchemaTypeUtil.INTEGER64_FORMAT.equals(schema.getFormat())) { // format: long (int64)
- return true;
- }
- return false;
+ // format: long (int64)
+ return SchemaTypeUtil.INTEGER_TYPE.equals(schema.getType()) // type: integer
+ && SchemaTypeUtil.INTEGER64_FORMAT.equals(schema.getFormat());
}
public static boolean isBooleanSchema(Schema schema) {
if (schema instanceof BooleanSchema) {
return true;
}
- if (SchemaTypeUtil.BOOLEAN_TYPE.equals(schema.getType())) {
- return true;
- }
- return false;
+ return SchemaTypeUtil.BOOLEAN_TYPE.equals(schema.getType());
}
public static boolean isNumberSchema(Schema schema) {
if (schema instanceof NumberSchema) {
return true;
}
- if (SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType())) {
- return true;
- }
- return false;
+ return SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType());
}
public static boolean isFloatSchema(Schema schema) {
- if (SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType())
- && SchemaTypeUtil.FLOAT_FORMAT.equals(schema.getFormat())) { // format: float
- return true;
- }
- return false;
+ // format: float
+ return SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType())
+ && SchemaTypeUtil.FLOAT_FORMAT.equals(schema.getFormat());
}
public static boolean isDoubleSchema(Schema schema) {
- if (SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType())
- && SchemaTypeUtil.DOUBLE_FORMAT.equals(schema.getFormat())) { // format: double
- return true;
- }
- return false;
+ // format: double
+ return SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType())
+ && SchemaTypeUtil.DOUBLE_FORMAT.equals(schema.getFormat());
}
public static boolean isDateSchema(Schema schema) {
@@ -616,55 +584,45 @@ public class ModelUtils {
return true;
}
- if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
- && SchemaTypeUtil.DATE_FORMAT.equals(schema.getFormat())) { // format: date
- return true;
- }
- return false;
+ // format: date
+ return SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
+ && SchemaTypeUtil.DATE_FORMAT.equals(schema.getFormat());
}
public static boolean isDateTimeSchema(Schema schema) {
if (schema instanceof DateTimeSchema) {
return true;
}
- if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
- && SchemaTypeUtil.DATE_TIME_FORMAT.equals(schema.getFormat())) { // format: date-time
- return true;
- }
- return false;
+ // format: date-time
+ return SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
+ && SchemaTypeUtil.DATE_TIME_FORMAT.equals(schema.getFormat());
}
public static boolean isPasswordSchema(Schema schema) {
if (schema instanceof PasswordSchema) {
return true;
}
- if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
- && SchemaTypeUtil.PASSWORD_FORMAT.equals(schema.getFormat())) { // double
- return true;
- }
- return false;
+ // double
+ return SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
+ && SchemaTypeUtil.PASSWORD_FORMAT.equals(schema.getFormat());
}
public static boolean isByteArraySchema(Schema schema) {
if (schema instanceof ByteArraySchema) {
return true;
}
- if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
- && SchemaTypeUtil.BYTE_FORMAT.equals(schema.getFormat())) { // format: byte
- return true;
- }
- return false;
+ // format: byte
+ return SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
+ && SchemaTypeUtil.BYTE_FORMAT.equals(schema.getFormat());
}
public static boolean isBinarySchema(Schema schema) {
if (schema instanceof BinarySchema) {
return true;
}
- if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
- && SchemaTypeUtil.BINARY_FORMAT.equals(schema.getFormat())) { // format: binary
- return true;
- }
- return false;
+ // format: binary
+ return SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
+ && SchemaTypeUtil.BINARY_FORMAT.equals(schema.getFormat());
}
public static boolean isFileSchema(Schema schema) {
@@ -679,38 +637,30 @@ public class ModelUtils {
if (schema instanceof UUIDSchema) {
return true;
}
- if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
- && SchemaTypeUtil.UUID_FORMAT.equals(schema.getFormat())) { // format: uuid
- return true;
- }
- return false;
+ // format: uuid
+ return SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
+ && SchemaTypeUtil.UUID_FORMAT.equals(schema.getFormat());
}
public static boolean isURISchema(Schema schema) {
- if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
- && URI_FORMAT.equals(schema.getFormat())) { // format: uri
- return true;
- }
- return false;
+ // format: uri
+ return SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
+ && URI_FORMAT.equals(schema.getFormat());
}
public static boolean isEmailSchema(Schema schema) {
if (schema instanceof EmailSchema) {
return true;
}
- if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
- && SchemaTypeUtil.EMAIL_FORMAT.equals(schema.getFormat())) { // format: email
- return true;
- }
- return false;
+ // format: email
+ return SchemaTypeUtil.STRING_TYPE.equals(schema.getType())
+ && SchemaTypeUtil.EMAIL_FORMAT.equals(schema.getFormat());
}
public static boolean isDecimalSchema(Schema schema) {
- if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) // type: string
- && "number".equals(schema.getFormat())) { // format: number
- return true;
- }
- return false;
+ // format: number
+ return SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) // type: string
+ && "number".equals(schema.getFormat());
}
/**
@@ -744,12 +694,9 @@ public class ModelUtils {
return false;
}
- if (null != schema.getProperties() && !schema.getProperties().isEmpty() && // has properties
+ return null != schema.getProperties() && !schema.getProperties().isEmpty() && // has properties
(schema.getAdditionalProperties() == null || // no additionalProperties is set
- (schema.getAdditionalProperties() instanceof Boolean && !(Boolean)schema.getAdditionalProperties()))) {
- return true;
- }
- return false;
+ (schema.getAdditionalProperties() instanceof Boolean && !(Boolean) schema.getAdditionalProperties()));
}
public static boolean hasValidation(Schema sc) {
@@ -839,14 +786,10 @@ public class ModelUtils {
if (addlProps instanceof ObjectSchema) {
ObjectSchema objSchema = (ObjectSchema) addlProps;
// additionalProperties defined as {}
- if (objSchema.getProperties() == null || objSchema.getProperties().isEmpty()) {
- return true;
- }
+ return objSchema.getProperties() == null || objSchema.getProperties().isEmpty();
} else if (addlProps instanceof Schema) {
// additionalProperties defined as {}
- if (addlProps.getType() == null && addlProps.get$ref() == null && (addlProps.getProperties() == null || addlProps.getProperties().isEmpty())) {
- return true;
- }
+ return addlProps.getType() == null && addlProps.get$ref() == null && (addlProps.getProperties() == null || addlProps.getProperties().isEmpty());
}
}
}
@@ -1088,25 +1031,25 @@ public class ModelUtils {
* Has self reference?
*
* @param openAPI OpenAPI spec.
- * @param schema Schema
+ * @param schema Schema
* @return boolean true if it has at least one self reference
*/
public static boolean hasSelfReference(OpenAPI openAPI,
- Schema schema) {
+ Schema schema) {
return hasSelfReference(openAPI, schema, null);
}
/**
* Has self reference?
*
- * @param openAPI OpenAPI spec.
- * @param schema Schema
+ * @param openAPI OpenAPI spec.
+ * @param schema Schema
* @param visitedSchemaNames A set of visited schema names
* @return boolean true if it has at least one self reference
*/
public static boolean hasSelfReference(OpenAPI openAPI,
- Schema schema,
- Set<String> visitedSchemaNames) {
+ Schema schema,
+ Set<String> visitedSchemaNames) {
if (visitedSchemaNames == null) {
visitedSchemaNames = new HashSet<String>();
}
@@ -1165,7 +1108,7 @@ public class ModelUtils {
return hasSelfReference(openAPI, schema.getNot(), visitedSchemaNames);
} else if (schema.getProperties() != null && !schema.getProperties().isEmpty()) {
// go through properties to see if there's any self-reference
- for (Schema property : ((Map<String, Schema>)schema.getProperties()).values()) {
+ for (Schema property : ((Map<String, Schema>) schema.getProperties()).values()) {
if (hasSelfReference(openAPI, property, visitedSchemaNames)) {
return true;
}
@@ -1261,7 +1204,7 @@ public class ModelUtils {
/**
* Returns the additionalProperties Schema for the specified input schema.
- *
+ * <p>
* The additionalProperties keyword is used to control the handling of additional, undeclared
* properties, that is, properties whose names are not listed in the properties keyword.
* The additionalProperties keyword may be either a boolean or an object.
@@ -1271,9 +1214,9 @@ public class ModelUtils {
* to the boolean value True or setting additionalProperties: {}
*
* @param openAPI the object that encapsulates the OAS document.
- * @param schema the input schema that may or may not have the additionalProperties keyword.
+ * @param schema the input schema that may or may not have the additionalProperties keyword.
* @return the Schema of the additionalProperties. The null value is returned if no additional
- * properties are allowed.
+ * properties are allowed.
*/
public static Schema getAdditionalProperties(OpenAPI openAPI, Schema schema) {
Object addProps = schema.getAdditionalProperties();
@@ -1352,14 +1295,13 @@ public class ModelUtils {
Map<String, List<Entry<String, Schema>>> groupedByParent = allSchemas.entrySet().stream()
.filter(entry -> isComposedSchema(entry.getValue()))
- .filter(entry -> getParentName((ComposedSchema) entry.getValue(), allSchemas)!=null)
+ .filter(entry -> getParentName((ComposedSchema) entry.getValue(), allSchemas) != null)
.collect(Collectors.groupingBy(entry -> getParentName((ComposedSchema) entry.getValue(), allSchemas)));
return groupedByParent.entrySet().stream()
.collect(Collectors.toMap(entry -> entry.getKey(), entry -> entry.getValue().stream().map(e -> e.getKey()).collect(Collectors.toList())));
}
-
/**
* Get the interfaces from the schema (composed)
*
@@ -1451,7 +1393,7 @@ public class ModelUtils {
// allOf with a single $ref (no discriminator)
// TODO to be removed in 5.x or 6.x release
LOGGER.info("[deprecated] inheritance without use of 'discriminator.propertyName' has been deprecated" +
- " in the 5.x release. Composed schema name: {}. Title: {}",
+ " in the 5.x release. Composed schema name: {}. Title: {}",
composedSchema.getName(), composedSchema.getTitle());
}
@@ -1507,8 +1449,7 @@ public class ModelUtils {
private static boolean hasOrInheritsDiscriminator(Schema schema, Map<String, Schema> allSchemas) {
if (schema.getDiscriminator() != null && StringUtils.isNotEmpty(schema.getDiscriminator().getPropertyName())) {
return true;
- }
- else if (StringUtils.isNotEmpty(schema.get$ref())) {
+ } else if (StringUtils.isNotEmpty(schema.get$ref())) {
String parentName = getSimpleRef(schema.get$ref());
Schema s = allSchemas.get(parentName);
if (s != null) {
@@ -1531,15 +1472,15 @@ public class ModelUtils {
/**
* Return true if the 'nullable' attribute is set to true in the schema, i.e. if the value
* of the property can be the null value.
- *
+ * <p>
* In addition, if the OAS document is 3.1 or above, isNullable returns true if the input
* schema is a 'oneOf' composed document with at most two children, and one of the children
* is the 'null' type.
- *
+ * <p>
* The caller is responsible for resolving schema references before invoking isNullable.
* If the input schema is a $ref and the referenced schema has 'nullable: true', this method
* returns false (because the nullable attribute is defined in the referenced schema).
- *
+ * <p>
* The 'nullable' attribute was introduced in OAS 3.0.
* The 'nullable' attribute is deprecated in OAS 3.1. In a OAS 3.1 document, the preferred way
* to specify nullable properties is to use the 'null' type.
@@ -1596,32 +1537,30 @@ public class ModelUtils {
/**
* isNullType returns true if the input schema is the 'null' type.
- *
+ * <p>
* The 'null' type is supported in OAS 3.1 and above. It is not supported
* in OAS 2.0 and OAS 3.0.x.
- *
+ * <p>
* For example, the "null" type could be used to specify that a value must
* either be null or a specified type:
- *
+ * <p>
* OptionalOrder:
- * oneOf:
- * - type: 'null'
- * - $ref: '#/components/schemas/Order'
+ * oneOf:
+ * - type: 'null'
+ * - $ref: '#/components/schemas/Order'
*
* @param schema the OpenAPI schema
* @return true if the schema is the 'null' type
*/
public static boolean isNullType(Schema schema) {
- if ("null".equals(schema.getType())) {
- return true;
- }
- return false;
+ return "null".equals(schema.getType());
}
/**
* For when a type is not defined on a schema
* Note: properties, additionalProperties, enums, validations, items, and composed schemas (oneOf/anyOf/allOf)
* can be defined or omitted on these any type schemas
+ *
* @param schema the schema that we are checking
* @return boolean
*/
@@ -1631,53 +1570,102 @@ public class ModelUtils {
public static void syncValidationProperties(Schema schema, IJsonSchemaValidationProperties target) {
// TODO move this method to IJsonSchemaValidationProperties
- if (schema != null && target != null) {
- if (isNullType(schema) || schema.get$ref() != null || isBooleanSchema(schema)) {
- return;
- }
- Integer minItems = schema.getMinItems();
- Integer maxItems = schema.getMaxItems();
- Boolean uniqueItems = schema.getUniqueItems();
- Integer minProperties = schema.getMinProperties();
- Integer maxProperties = schema.getMaxProperties();
- Integer minLength = schema.getMinLength();
- Integer maxLength = schema.getMaxLength();
- String pattern = schema.getPattern();
- BigDecimal multipleOf = schema.getMultipleOf();
- BigDecimal minimum = schema.getMinimum();
- BigDecimal maximum = schema.getMaximum();
- Boolean exclusiveMinimum = schema.getExclusiveMinimum();
- Boolean exclusiveMaximum = schema.getExclusiveMaximum();
-
- if (isArraySchema(schema)) {
+ if (schema == null ||
+ target == null ||
+ schema.get$ref() != null)
+ return;
+ SchemaValidations.ValidationSetBuilder vSB = new SchemaValidations.ValidationSetBuilder();
+
+ Integer minItems = schema.getMinItems();
+ if (minItems != null) vSB.withMinItems();
+
+ Integer maxItems = schema.getMaxItems();
+ if (maxItems != null) vSB.withMaxItems();
+
+ Boolean uniqueItems = schema.getUniqueItems();
+ if (uniqueItems != null) vSB.withUniqueItems();
+
+ Integer minProperties = schema.getMinProperties();
+ if (minProperties != null) vSB.withMinProperties();
+
+ Integer maxProperties = schema.getMaxProperties();
+ if (maxProperties != null) vSB.withMaxProperties();
+
+ Integer minLength = schema.getMinLength();
+ if (minLength != null) vSB.withMinLength();
+
+ Integer maxLength = schema.getMaxLength();
+ if (maxLength != null) vSB.withMaxLength();
+
+ String pattern = schema.getPattern();
+ if (pattern != null) vSB.withPattern();
+
+ BigDecimal multipleOf = schema.getMultipleOf();
+ if (multipleOf != null) vSB.withMultipleOf();
+
+ BigDecimal minimum = schema.getMinimum();
+ if (minimum != null) vSB.withMinimum();
+
+ BigDecimal maximum = schema.getMaximum();
+ if (maximum != null) vSB.withMaximum();
+
+ Boolean exclusiveMinimum = schema.getExclusiveMinimum();
+ if (exclusiveMinimum != null) vSB.withExclusiveMinimum();
+
+ Boolean exclusiveMaximum = schema.getExclusiveMaximum();
+ if (exclusiveMaximum != null) vSB.withExclusiveMaximum();
+
+ LinkedHashSet<String> setValidations = vSB.build();
+
+ if (isBooleanSchema(schema) || isNullType(schema)) {
+ logWarnMessagesForIneffectiveValidations(setValidations, schema, new HashSet<>());
+ } else if (isArraySchema(schema)) {
+ if (minItems != null || maxItems != null || uniqueItems != null)
setArrayValidations(minItems, maxItems, uniqueItems, target);
- } else if (isTypeObjectSchema(schema)) {
+ logWarnMessagesForIneffectiveValidations(new LinkedHashSet(setValidations), schema, SchemaValidations.ARRAY_VALIDATIONS);
+ } else if (isTypeObjectSchema(schema)) {
+ if (minProperties != null || maxProperties != null)
setObjectValidations(minProperties, maxProperties, target);
- } else if (isStringSchema(schema)) {
+ logWarnMessagesForIneffectiveValidations(new LinkedHashSet(setValidations), schema, SchemaValidations.OBJECT_VALIDATIONS);
+ } else if (isStringSchema(schema)) {
+ if (minLength != null || maxLength != null || pattern != null)
setStringValidations(minLength, maxLength, pattern, target);
- if (isDecimalSchema(schema)) {
+ if (isDecimalSchema(schema)) {
+ if (multipleOf != null || minimum != null || maximum != null || exclusiveMinimum != null || exclusiveMaximum != null)
setNumericValidations(schema, multipleOf, minimum, maximum, exclusiveMinimum, exclusiveMaximum, target);
- }
- } else if (isNumberSchema(schema) || isIntegerSchema(schema)) {
- setNumericValidations(schema, multipleOf, minimum, maximum, exclusiveMinimum, exclusiveMaximum, target);
- } else if (isAnyType(schema)) {
- // anyType can have any validations set on it
- setArrayValidations(minItems, maxItems, uniqueItems, target);
- setObjectValidations(minProperties, maxProperties, target);
- setStringValidations(minLength, maxLength, pattern, target);
- setNumericValidations(schema, multipleOf, minimum, maximum, exclusiveMinimum, exclusiveMaximum, target);
- }
- if (maxItems != null || minItems != null || minProperties != null || maxProperties != null || minLength != null || maxLength != null || multipleOf != null || pattern != null || minimum != null || maximum != null || exclusiveMinimum != null || exclusiveMaximum != null || uniqueItems != null) {
- target.setHasValidation(true);
- }
+ Set<String> stringAndNumericValidations = new HashSet<>(SchemaValidations.STRING_VALIDATIONS);
+ stringAndNumericValidations.addAll(SchemaValidations.NUMERIC_VALIDATIONS);
+ logWarnMessagesForIneffectiveValidations(new LinkedHashSet(setValidations), schema, stringAndNumericValidations);
+ } else
+ logWarnMessagesForIneffectiveValidations(new LinkedHashSet(setValidations), schema, SchemaValidations.STRING_VALIDATIONS);
+
+ } else if (isNumberSchema(schema) || isIntegerSchema(schema)) {
+ if (multipleOf != null || minimum != null || maximum != null || exclusiveMinimum != null || exclusiveMaximum != null)
+ setNumericValidations(schema, multipleOf, minimum, maximum, exclusiveMinimum, exclusiveMaximum, target);
+ logWarnMessagesForIneffectiveValidations(new LinkedHashSet(setValidations), schema, SchemaValidations.NUMERIC_VALIDATIONS);
+ } else if (isAnyType(schema)) {
+ // anyType can have any validations set on it
+ setArrayValidations(minItems, maxItems, uniqueItems, target);
+ setObjectValidations(minProperties, maxProperties, target);
+ setStringValidations(minLength, maxLength, pattern, target);
+ setNumericValidations(schema, multipleOf, minimum, maximum, exclusiveMinimum, exclusiveMaximum, target);
}
+
+ if (!setValidations.isEmpty())
+ target.setHasValidation(true);
}
private static void setArrayValidations(Integer minItems, Integer maxItems, Boolean uniqueItems, IJsonSchemaValidationProperties target) {
- if (minItems != null) target.setMinItems(minItems);
- if (maxItems != null) target.setMaxItems(maxItems);
- if (uniqueItems != null) target.setUniqueItems(uniqueItems);
+ if (minItems != null) {
+ target.setMinItems(minItems);
+ }
+ if (maxItems != null) {
+ target.setMaxItems(maxItems);
+ }
+ if (uniqueItems != null) {
+ target.setUniqueItems(uniqueItems);
+ }
}
private static void setObjectValidations(Integer minProperties, Integer maxProperties, IJsonSchemaValidationProperties target) {
@@ -1711,9 +1699,16 @@ public class ModelUtils {
}
}
+ private static void logWarnMessagesForIneffectiveValidations(Set<String> setValidations, Schema schema, Set<String> effectiveValidations) {
+ setValidations.removeAll(effectiveValidations);
+ setValidations.stream().forEach(validation -> {
+ LOGGER.warn("Validation '" + validation + "' has no effect on schema. Ignoring!");
+ });
+ }
+
private static ObjectMapper getRightMapper(String data) {
ObjectMapper mapper;
- if(data.trim().startsWith("{")) {
+ if (data.trim().startsWith("{")) {
mapper = JSON_MAPPER;
} else {
mapper = YAML_MAPPER;
@@ -1725,15 +1720,13 @@ public class ModelUtils {
* Parse and return a JsonNode representation of the input OAS document.
*
* @param location the URL of the OAS document.
- * @param auths the list of authorization values to access the remote URL.
- *
- * @throws java.lang.Exception if an error occurs while retrieving the OpenAPI document.
- *
+ * @param auths the list of authorization values to access the remote URL.
* @return A JsonNode representation of the input OAS document.
+ * @throws java.lang.Exception if an error occurs while retrieving the OpenAPI document.
*/
public static JsonNode readWithInfo(String location, List<AuthorizationValue> auths) throws Exception {
String data;
- location = location.replaceAll("\\\\","/");
+ location = location.replaceAll("\\\\", "/");
if (location.toLowerCase(Locale.ROOT).startsWith("http")) {
data = RemoteUrl.urlToString(location, auths);
} else {
@@ -1756,14 +1749,13 @@ public class ModelUtils {
/**
* Parse the OAS document at the specified location, get the swagger or openapi version
* as specified in the source document, and return the version.
- *
+ * <p>
* For OAS 2.0 documents, return the value of the 'swagger' attribute.
* For OAS 3.x documents, return the value of the 'openapi' attribute.
*
- * @param openAPI the object that encapsulates the OAS document.
+ * @param openAPI the object that encapsulates the OAS document.
* @param location the URL of the OAS document.
- * @param auths the list of authorization values to access the remote URL.
- *
+ * @param auths the list of authorization values to access the remote URL.
* @return the version of the OpenAPI document.
*/
public static SemVer getOpenApiVersion(OpenAPI openAPI, String location, List<AuthorizationValue> auths) {
@@ -1788,4 +1780,125 @@ public class ModelUtils {
return new SemVer(version);
}
+
+ @FunctionalInterface
+ private interface OpenAPISchemaVisitor {
+
+ void visit(Schema schema, String mimeType);
+ }
+
+ private static final class SchemaValidations {
+
+ public static Set<String> ARRAY_VALIDATIONS = new ValidationSetBuilder()
+ .withMinItems()
+ .withMaxItems()
+ .withUniqueItems()
+ .build();
+ public static Set<String> OBJECT_VALIDATIONS = new ValidationSetBuilder()
+ .withMinProperties()
+ .withMaxProperties()
+ .build();
+ public static Set<String> STRING_VALIDATIONS = new ValidationSetBuilder()
+ .withMinLength()
+ .withMaxLength()
+ .withPattern()
+ .build();
+ public static Set<String> NUMERIC_VALIDATIONS = new ValidationSetBuilder()
+ .withMultipleOf()
+ .withMinimum()
+ .withMaximum()
+ .withExclusiveMinimum()
+ .withExclusiveMaximum()
+ .build();
+
+ public static Set<String> ALL_VALIDATIONS;
+
+ static {
+ ALL_VALIDATIONS = new HashSet<>(ARRAY_VALIDATIONS);
+ ALL_VALIDATIONS.addAll(OBJECT_VALIDATIONS);
+ ALL_VALIDATIONS.addAll(STRING_VALIDATIONS);
+ ALL_VALIDATIONS.addAll(NUMERIC_VALIDATIONS);
+ }
+
+ SchemaValidations() {
+ }
+
+
+ public static class ValidationSetBuilder {
+ LinkedHashSet<String> validationSet;
+
+ ValidationSetBuilder() {
+ this.validationSet = new LinkedHashSet<String>();
+ }
+
+ public ValidationSetBuilder withMinItems() {
+ this.validationSet.add("minItems");
+ return this;
+ }
+
+ public ValidationSetBuilder withMaxItems() {
+ this.validationSet.add("maxItems");
+ return this;
+ }
+
+ public ValidationSetBuilder withUniqueItems() {
+ this.validationSet.add("uniqueItems");
+ return this;
+ }
+
+ public ValidationSetBuilder withMinProperties() {
+ this.validationSet.add("minProperties");
+ return this;
+ }
+
+ public ValidationSetBuilder withMaxProperties() {
+ this.validationSet.add("maxProperties");
+ return this;
+ }
+
+ public ValidationSetBuilder withMinLength() {
+ this.validationSet.add("minLength");
+ return this;
+ }
+
+ public ValidationSetBuilder withMaxLength() {
+ this.validationSet.add("maxLength");
+ return this;
+ }
+
+ public ValidationSetBuilder withPattern() {
+ this.validationSet.add("pattern");
+ return this;
+ }
+
+ public ValidationSetBuilder withMultipleOf() {
+ this.validationSet.add("multipleOf");
+ return this;
+ }
+
+ public ValidationSetBuilder withMinimum() {
+ this.validationSet.add("minimum");
+ return this;
+ }
+
+ public ValidationSetBuilder withMaximum() {
+ this.validationSet.add("maximum");
+ return this;
+ }
+
+ public ValidationSetBuilder withExclusiveMinimum() {
+ this.validationSet.add("exclusiveMinimum");
+ return this;
+ }
+
+ public ValidationSetBuilder withExclusiveMaximum() {
+ this.validationSet.add("exclusiveMaximum");
+ return this;
+ }
+
+ public LinkedHashSet<String> build() {
+ return this.validationSet;
+ }
+ }
+ }
}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
index 29c7066193d7df19269a0322bcf98cf5b8189063..95d7b2a9127556e55347f734fc76f548bd6abb75 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
@@ -17,9 +17,13 @@
package org.openapitools.codegen;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.read.ListAppender;
import com.google.common.collect.Sets;
import com.samskivert.mustache.Mustache.Lambda;
-
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
@@ -33,18 +37,14 @@ import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.oas.models.security.SecurityScheme;
import io.swagger.v3.parser.core.models.ParseOptions;
-
import org.openapitools.codegen.config.CodegenConfigurator;
import org.openapitools.codegen.config.GlobalSettings;
import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.ModelsMap;
-import org.openapitools.codegen.templating.mustache.CamelCaseLambda;
-import org.openapitools.codegen.templating.mustache.IndentedLambda;
-import org.openapitools.codegen.templating.mustache.LowercaseLambda;
-import org.openapitools.codegen.templating.mustache.TitlecaseLambda;
-import org.openapitools.codegen.templating.mustache.UppercaseLambda;
+import org.openapitools.codegen.templating.mustache.*;
import org.openapitools.codegen.utils.ModelUtils;
import org.openapitools.codegen.utils.SemVer;
+import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.Ignore;
import org.testng.annotations.Test;
@@ -54,11 +54,13 @@ import java.nio.file.Files;
import java.util.*;
import java.util.stream.Collectors;
+import static junit.framework.Assert.assertEquals;
import static org.testng.Assert.*;
-
public class DefaultCodegenTest {
+ private static final Logger testLogger = (Logger) LoggerFactory.getLogger(ModelUtils.class);
+
@Test
public void testDeeplyNestedAdditionalPropertiesImports() {
final DefaultCodegen codegen = new DefaultCodegen();
@@ -668,7 +670,6 @@ public class DefaultCodegenTest {
Assert.assertTrue(colorSeen);
}
-
@Test
public void testEscapeText() {
final DefaultCodegen codegen = new DefaultCodegen();
@@ -1592,7 +1593,6 @@ public class DefaultCodegenTest {
assertEquals(cm.discriminator, discriminator);
}
-
@Test
public void testAllOfSingleRefNoOwnProps() {
final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/2_0/composed-allof.yaml");
@@ -1606,14 +1606,6 @@ public class DefaultCodegenTest {
Assert.assertNull(model.allParents);
}
- class CodegenWithMultipleInheritance extends DefaultCodegen {
- public CodegenWithMultipleInheritance() {
- super();
- supportsInheritance = true;
- supportsMultipleInheritance = true;
- }
- }
-
@Test
public void testAllOfParent() {
final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/allOf-required-parent.yaml");
@@ -2223,83 +2215,6 @@ public class DefaultCodegenTest {
assertEquals(codegen.toApiName(""), "DefaultApi");
}
- public static class FromParameter {
- private CodegenParameter codegenParameter(String path) {
- final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/fromParameter.yaml");
- new InlineModelResolver().flatten(openAPI);
- final DefaultCodegen codegen = new DefaultCodegen();
- codegen.setOpenAPI(openAPI);
-
- return codegen
- .fromParameter(
- openAPI
- .getPaths()
- .get(path)
- .getGet()
- .getParameters()
- .get(0),
- new HashSet<>()
- );
- }
-
- @Test
- public void setStyle() {
- CodegenParameter parameter = codegenParameter("/set_style");
- assertEquals(parameter.style, "form");
- }
-
- @Test
- public void setShouldExplode() {
- CodegenParameter parameter = codegenParameter("/set_should_explode");
- assertTrue(parameter.isExplode);
- }
-
- @Test
- public void testConvertPropertyToBooleanAndWriteBack_Boolean_true() {
- final DefaultCodegen codegen = new DefaultCodegen();
- Map<String, Object> additionalProperties = codegen.additionalProperties();
- additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, true);
- boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL);
- Assert.assertTrue(result);
- }
-
- @Test
- public void testConvertPropertyToBooleanAndWriteBack_Boolean_false() {
- final DefaultCodegen codegen = new DefaultCodegen();
- Map<String, Object> additionalProperties = codegen.additionalProperties();
- additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, false);
- boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL);
- Assert.assertFalse(result);
- }
-
- @Test
- public void testConvertPropertyToBooleanAndWriteBack_String_true() {
- final DefaultCodegen codegen = new DefaultCodegen();
- Map<String, Object> additionalProperties = codegen.additionalProperties();
- additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "true");
- boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL);
- Assert.assertTrue(result);
- }
-
- @Test
- public void testConvertPropertyToBooleanAndWriteBack_String_false() {
- final DefaultCodegen codegen = new DefaultCodegen();
- Map<String, Object> additionalProperties = codegen.additionalProperties();
- additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "false");
- boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL);
- Assert.assertFalse(result);
- }
-
- @Test
- public void testConvertPropertyToBooleanAndWriteBack_String_blibb() {
- final DefaultCodegen codegen = new DefaultCodegen();
- Map<String, Object> additionalProperties = codegen.additionalProperties();
- additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "blibb");
- boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL);
- Assert.assertFalse(result);
- }
- }
-
@Test
public void testCircularReferencesDetection() {
// given
@@ -2449,7 +2364,7 @@ public class DefaultCodegenTest {
"post",
path.getPost(),
path.getServers());
- assertEquals(operation.formParams.size(), 3,
+ Assert.assertEquals(operation.formParams.size(), 3,
"The list of parameters should include inherited type");
final List<String> names = operation.formParams.stream()
@@ -3717,7 +3632,7 @@ public class DefaultCodegenTest {
modelName = "ObjectWithComposedProperties";
CodegenModel m = codegen.fromModel(modelName, openAPI.getComponents().getSchemas().get(modelName));
/* TODO inline allOf schema are created as separate models and the following assumptions that
- the properties are non-model are no longer valid and need to be revised
+ the properties are non-model are no longer valid and need to be revised
assertTrue(m.vars.get(0).getIsMap());
assertTrue(m.vars.get(1).getIsNumber());
assertTrue(m.vars.get(2).getIsUnboundedInteger());
@@ -4205,4 +4120,356 @@ public class DefaultCodegenTest {
Assert.assertEquals(codegenParameter.defaultValue, "1971-12-19T03:39:57-08:00");
Assert.assertEquals(codegenParameter.getSchema(), null);
}
+
+ @Test
+ public void testArraySchemaWithIneffectiveConstraints() {
+
+ ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
+ listAppender.start();
+
+ // add the appender to the logger
+ testLogger.addAppender(listAppender);
+
+ final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue6491.yaml");
+ final DefaultCodegen codegen = new DefaultCodegen();
+ codegen.setOpenAPI(openAPI);
+
+ String modelName = "ArrayWithIneffectiveValidations";
+ Schema sc = openAPI.getComponents().getSchemas().get(modelName);
+ CodegenModel cm = codegen.fromModel(modelName, sc);
+
+
+ List<ILoggingEvent> logsList = listAppender.list;
+
+ // JUnit assertions
+ assertEquals(16, logsList.size());
+ assertEquals("Validation 'minProperties' has no effect on schema. Ignoring!", logsList.get(0)
+ .getMessage());
+ assertEquals("Validation 'maxProperties' has no effect on schema. Ignoring!", logsList.get(1)
+ .getMessage());
+ assertEquals("Validation 'minLength' has no effect on schema. Ignoring!", logsList.get(2)
+ .getMessage());
+ assertEquals("Validation 'maxLength' has no effect on schema. Ignoring!", logsList.get(3)
+ .getMessage());
+ assertEquals("Validation 'pattern' has no effect on schema. Ignoring!", logsList.get(4)
+ .getMessage());
+ assertEquals("Validation 'multipleOf' has no effect on schema. Ignoring!", logsList.get(5)
+ .getMessage());
+ assertEquals("Validation 'minimum' has no effect on schema. Ignoring!", logsList.get(6)
+ .getMessage());
+ assertEquals("Validation 'maximum' has no effect on schema. Ignoring!", logsList.get(7)
+ .getMessage());
+
+ // Assert all logged messages are WARN messages
+ logsList.stream().limit(8).forEach(log -> assertEquals(Level.WARN, log.getLevel()));
+
+
+ }
+
+ @Test
+ public void testObjectSchemaWithIneffectiveConstraints() {
+
+ ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
+ listAppender.start();
+
+ // add the appender to the logger
+ testLogger.addAppender(listAppender);
+
+ final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue6491.yaml");
+ final DefaultCodegen codegen = new DefaultCodegen();
+ codegen.setOpenAPI(openAPI);
+
+ String modelName = "ObjectWithIneffectiveValidations";
+ Schema sc = openAPI.getComponents().getSchemas().get(modelName);
+ CodegenModel cm = codegen.fromModel(modelName, sc);
+
+ List<ILoggingEvent> logsList = listAppender.list;
+
+ // JUnit assertions
+ assertEquals(9, logsList.size());
+ assertEquals("Validation 'minItems' has no effect on schema. Ignoring!", logsList.get(0)
+ .getMessage());
+ assertEquals("Validation 'maxItems' has no effect on schema. Ignoring!", logsList.get(1)
+ .getMessage());
+ assertEquals("Validation 'uniqueItems' has no effect on schema. Ignoring!", logsList.get(2)
+ .getMessage());
+ assertEquals("Validation 'minLength' has no effect on schema. Ignoring!", logsList.get(3)
+ .getMessage());
+ assertEquals("Validation 'maxLength' has no effect on schema. Ignoring!", logsList.get(4)
+ .getMessage());
+ assertEquals("Validation 'pattern' has no effect on schema. Ignoring!", logsList.get(5)
+ .getMessage());
+ assertEquals("Validation 'multipleOf' has no effect on schema. Ignoring!", logsList.get(6)
+ .getMessage());
+ assertEquals("Validation 'minimum' has no effect on schema. Ignoring!", logsList.get(7)
+ .getMessage());
+ assertEquals("Validation 'maximum' has no effect on schema. Ignoring!", logsList.get(8)
+ .getMessage());
+
+ // Assert all logged messages are WARN messages
+ logsList.stream().forEach(log -> assertEquals(Level.WARN, log.getLevel()));
+ }
+
+ @Test
+ public void testStringSchemaWithIneffectiveConstraints() {
+
+ ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
+ listAppender.start();
+
+ // add the appender to the logger
+ testLogger.addAppender(listAppender);
+
+ final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue6491.yaml");
+ final DefaultCodegen codegen = new DefaultCodegen();
+ codegen.setOpenAPI(openAPI);
+
+ String modelName = "StringWithIneffectiveValidations";
+ Schema sc = openAPI.getComponents().getSchemas().get(modelName);
+ CodegenModel cm = codegen.fromModel(modelName, sc);
+
+ List<ILoggingEvent> logsList = listAppender.list;
+
+ // JUnit assertions
+ assertEquals(8, logsList.size());
+ assertEquals("Validation 'minItems' has no effect on schema. Ignoring!", logsList.get(0)
+ .getMessage());
+ assertEquals("Validation 'maxItems' has no effect on schema. Ignoring!", logsList.get(1)
+ .getMessage());
+ assertEquals("Validation 'uniqueItems' has no effect on schema. Ignoring!", logsList.get(2)
+ .getMessage());
+ assertEquals("Validation 'minProperties' has no effect on schema. Ignoring!", logsList.get(3)
+ .getMessage());
+ assertEquals("Validation 'maxProperties' has no effect on schema. Ignoring!", logsList.get(4)
+ .getMessage());
+ assertEquals("Validation 'multipleOf' has no effect on schema. Ignoring!", logsList.get(5)
+ .getMessage());
+ assertEquals("Validation 'minimum' has no effect on schema. Ignoring!", logsList.get(6)
+ .getMessage());
+ assertEquals("Validation 'maximum' has no effect on schema. Ignoring!", logsList.get(7)
+ .getMessage());
+
+ // Assert all logged messages are WARN messages
+ logsList.stream().forEach(log -> assertEquals(Level.WARN, log.getLevel()));
+ }
+
+ @Test
+ public void testIntegerSchemaWithIneffectiveConstraints() {
+
+ ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
+ listAppender.start();
+
+ // add the appender to the logger
+ testLogger.addAppender(listAppender);
+
+ final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue6491.yaml");
+ final DefaultCodegen codegen = new DefaultCodegen();
+ codegen.setOpenAPI(openAPI);
+
+ String modelName = "IntegerWithIneffectiveValidations";
+ Schema sc = openAPI.getComponents().getSchemas().get(modelName);
+ CodegenModel cm = codegen.fromModel(modelName, sc);
+
+ List<ILoggingEvent> logsList = listAppender.list;
+
+ // JUnit assertions
+ assertEquals(8, logsList.size());
+ assertEquals("Validation 'minItems' has no effect on schema. Ignoring!", logsList.get(0)
+ .getMessage());
+ assertEquals("Validation 'maxItems' has no effect on schema. Ignoring!", logsList.get(1)
+ .getMessage());
+ assertEquals("Validation 'uniqueItems' has no effect on schema. Ignoring!", logsList.get(2)
+ .getMessage());
+ assertEquals("Validation 'minProperties' has no effect on schema. Ignoring!", logsList.get(3)
+ .getMessage());
+ assertEquals("Validation 'maxProperties' has no effect on schema. Ignoring!", logsList.get(4)
+ .getMessage());
+ assertEquals("Validation 'minLength' has no effect on schema. Ignoring!", logsList.get(5)
+ .getMessage());
+ assertEquals("Validation 'maxLength' has no effect on schema. Ignoring!", logsList.get(6)
+ .getMessage());
+ assertEquals("Validation 'pattern' has no effect on schema. Ignoring!", logsList.get(7)
+ .getMessage());
+
+ // Assert all logged messages are WARN messages
+ logsList.stream().forEach(log -> assertEquals(Level.WARN, log.getLevel()));
+ }
+
+ @Test
+ public void anySchemaWithIneffectiveConstraints() {
+
+ ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
+ listAppender.start();
+
+ // add the appender to the logger
+ testLogger.addAppender(listAppender);
+
+ final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue6491.yaml");
+ final DefaultCodegen codegen = new DefaultCodegen();
+ codegen.setOpenAPI(openAPI);
+
+ String modelName = "AnyTypeWithIneffectiveValidations";
+ Schema sc = openAPI.getComponents().getSchemas().get(modelName);
+ CodegenModel cm = codegen.fromModel(modelName, sc);
+
+ List<ILoggingEvent> logsList = listAppender.list;
+
+ // JUnit assertions
+ assertEquals(0, logsList.size());
+ }
+
+ @Test
+ public void booleanSchemaWithIneffectiveConstraints() {
+
+ ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
+ listAppender.start();
+
+ // add the appender to the logger
+ testLogger.addAppender(listAppender);
+
+ final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue6491.yaml");
+ final DefaultCodegen codegen = new DefaultCodegen();
+ codegen.setOpenAPI(openAPI);
+
+ String modelName = "BooleanWithIneffectiveValidations";
+ Schema sc = openAPI.getComponents().getSchemas().get(modelName);
+ CodegenModel cm = codegen.fromModel(modelName, sc);
+
+ List<ILoggingEvent> logsList = listAppender.list;
+
+ // JUnit assertions
+ assertEquals(11, logsList.size());
+ assertEquals("Validation 'minItems' has no effect on schema. Ignoring!", logsList.get(0)
+ .getMessage());
+ assertEquals("Validation 'maxItems' has no effect on schema. Ignoring!", logsList.get(1)
+ .getMessage());
+ assertEquals("Validation 'uniqueItems' has no effect on schema. Ignoring!", logsList.get(2)
+ .getMessage());
+ assertEquals("Validation 'minProperties' has no effect on schema. Ignoring!", logsList.get(3)
+ .getMessage());
+ assertEquals("Validation 'maxProperties' has no effect on schema. Ignoring!", logsList.get(4)
+ .getMessage());
+ assertEquals("Validation 'minLength' has no effect on schema. Ignoring!", logsList.get(5)
+ .getMessage());
+ assertEquals("Validation 'maxLength' has no effect on schema. Ignoring!", logsList.get(6)
+ .getMessage());
+ assertEquals("Validation 'pattern' has no effect on schema. Ignoring!", logsList.get(7)
+ .getMessage());
+ assertEquals("Validation 'multipleOf' has no effect on schema. Ignoring!", logsList.get(8)
+ .getMessage());
+ assertEquals("Validation 'minimum' has no effect on schema. Ignoring!", logsList.get(9)
+ .getMessage());
+ assertEquals("Validation 'maximum' has no effect on schema. Ignoring!", logsList.get(10)
+ .getMessage());
+
+ // Assert all logged messages are WARN messages
+ logsList.stream().forEach(log -> assertEquals(Level.WARN, log.getLevel()));
+ }
+
+ @Test
+ public void nullSchemaWithIneffectiveConstraints() {
+
+ ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
+ listAppender.start();
+
+ // add the appender to the logger
+ testLogger.addAppender(listAppender);
+
+ final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue6491.yaml");
+ final DefaultCodegen codegen = new DefaultCodegen();
+ codegen.setOpenAPI(openAPI);
+
+ String modelName = "NullWithIneffectiveValidations";
+ Schema sc = openAPI.getComponents().getSchemas().get(modelName);
+ CodegenModel cm = codegen.fromModel(modelName, sc);
+
+ List<ILoggingEvent> logsList = listAppender.list;
+
+ // JUnit assertions
+ assertEquals(0, logsList.size());
+ }
+
+ public static class FromParameter {
+ private CodegenParameter codegenParameter(String path) {
+ final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/fromParameter.yaml");
+ new InlineModelResolver().flatten(openAPI);
+ final DefaultCodegen codegen = new DefaultCodegen();
+ codegen.setOpenAPI(openAPI);
+
+ return codegen
+ .fromParameter(
+ openAPI
+ .getPaths()
+ .get(path)
+ .getGet()
+ .getParameters()
+ .get(0),
+ new HashSet<>()
+ );
+ }
+
+ @Test
+ public void setStyle() {
+ CodegenParameter parameter = codegenParameter("/set_style");
+ assertEquals(parameter.style, "form");
+ }
+
+ @Test
+ public void setShouldExplode() {
+ CodegenParameter parameter = codegenParameter("/set_should_explode");
+ assertTrue(parameter.isExplode);
+ }
+
+ @Test
+ public void testConvertPropertyToBooleanAndWriteBack_Boolean_true() {
+ final DefaultCodegen codegen = new DefaultCodegen();
+ Map<String, Object> additionalProperties = codegen.additionalProperties();
+ additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, true);
+ boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL);
+ Assert.assertTrue(result);
+ }
+
+ @Test
+ public void testConvertPropertyToBooleanAndWriteBack_Boolean_false() {
+ final DefaultCodegen codegen = new DefaultCodegen();
+ Map<String, Object> additionalProperties = codegen.additionalProperties();
+ additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, false);
+ boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL);
+ Assert.assertFalse(result);
+ }
+
+ @Test
+ public void testConvertPropertyToBooleanAndWriteBack_String_true() {
+ final DefaultCodegen codegen = new DefaultCodegen();
+ Map<String, Object> additionalProperties = codegen.additionalProperties();
+ additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "true");
+ boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL);
+ Assert.assertTrue(result);
+ }
+
+ @Test
+ public void testConvertPropertyToBooleanAndWriteBack_String_false() {
+ final DefaultCodegen codegen = new DefaultCodegen();
+ Map<String, Object> additionalProperties = codegen.additionalProperties();
+ additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "false");
+ boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL);
+ Assert.assertFalse(result);
+ }
+
+ @Test
+ public void testConvertPropertyToBooleanAndWriteBack_String_blibb() {
+ final DefaultCodegen codegen = new DefaultCodegen();
+ Map<String, Object> additionalProperties = codegen.additionalProperties();
+ additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "blibb");
+ boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL);
+ Assert.assertFalse(result);
+ }
+ }
+
+ class CodegenWithMultipleInheritance extends DefaultCodegen {
+ public CodegenWithMultipleInheritance() {
+ super();
+ supportsInheritance = true;
+ supportsMultipleInheritance = true;
+ }
+ }
}
diff --git a/modules/openapi-generator/src/test/resources/3_0/issue6491.yaml b/modules/openapi-generator/src/test/resources/3_0/issue6491.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a0076559ff28a7a6f2d03e661baf16afa7e5c58d
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/issue6491.yaml
@@ -0,0 +1,124 @@
+openapi: 3.0.1
+info:
+ title: My title
+ description: API under test
+ version: 1.0.7
+servers:
+ - url: https://localhost:9999/root
+paths:
+ /location:
+ get:
+ operationId: getLocation
+ responses:
+ '200':
+ description: Success
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/ArrayWithIneffectiveValidations'
+components:
+ schemas:
+ ArrayWithIneffectiveValidations:
+ type: array
+ items: {}
+ minProperties: 1
+ maxProperties: 5
+ minLength: 1
+ maxLength: 5
+ pattern: 'abcde'
+ multipleOf: 3
+ minimum: 1
+ maximum: 10
+ exclusiveMinimum: 0
+ exclusiveMaximum: 100
+
+ ObjectWithIneffectiveValidations:
+ type: object
+ properties:
+ id:
+ type: integer
+ name:
+ type: string
+ minItems: 1
+ maxItems: 5
+ uniqueItems: true
+ minLength: 1
+ maxLength: 10
+ pattern: 'abcde'
+ multipleOf: 3
+ minimum: 1
+ maximum: 10
+ exclusiveMinimum: 1
+ exclusiveMaximum: 10
+
+
+ StringWithIneffectiveValidations:
+ type: string
+ minItems: 1
+ maxItems: 5
+ uniqueItems: true
+ minProperties: 1
+ maxProperties: 5
+ multipleOf: 3
+ minimum: 1
+ maximum: 10
+ exclusiveMinimum: 0
+ exclusiveMaximum: 100
+
+ IntegerWithIneffectiveValidations:
+ type: integer
+ minItems: 1
+ maxItems: 5
+ uniqueItems: true
+ minProperties: 1
+ maxProperties: 5
+ minLength: 1
+ maxLength: 10
+ pattern: 'abcde'
+
+ AnyTypeWithIneffectiveValidations:
+ minItems: 1
+ maxItems: 5
+ uniqueItems: true
+ minProperties: 1
+ maxProperties: 5
+ minLength: 1
+ maxLength: 10
+ pattern: 'abcde'
+ multipleOf: 4
+ minimum: 1
+ maximum: 99
+ exclusiveMinimum: 0
+ exclusiveMaximum: 100
+
+ BooleanWithIneffectiveValidations:
+ type: boolean
+ minItems: 1
+ maxItems: 5
+ uniqueItems: true
+ minProperties: 1
+ maxProperties: 5
+ minLength: 1
+ maxLength: 10
+ pattern: 'abcde'
+ multipleOf: 4
+ minimum: 1
+ maximum: 99
+ exclusiveMinimum: 0
+ exclusiveMaximum: 100
+
+ NullWithIneffectiveValidations:
+ type: null
+ minItems: 1
+ maxItems: 5
+ uniqueItems: true
+ minProperties: 1
+ maxProperties: 5
+ minLength: 1
+ maxLength: 10
+ pattern: 'abcde'
+ multipleOf: 4
+ minimum: 1
+ maximum: 99
+ exclusiveMinimum: 0
+ exclusiveMaximum: 100
diff --git a/pom.xml b/pom.xml
index 3ad05ef1fb392a1421b115bf31bafd64cb9d57c5..852a9ffc6bf047ac7b2932e1c9dafe535844b168 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,11 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>5</version>
- <relativePath/><!-- lookup parent from repository -->
+ <relativePath/>
+ <!-- lookup parent from repository -->
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.openapitools</groupId>