diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java index 069b2a2d100..d50ee983982 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java @@ -150,9 +150,9 @@ public interface CodegenConfig { Map reservedWordsMappings(); - void preprocessOpenAPI(OpenAPI openAPI); + void preprocessOpenAPI(); - void processOpenAPI(OpenAPI openAPI); + void processOpenAPI(); Compiler processCompiler(Compiler compiler); 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 692c71fe925..090b3407a65 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 @@ -788,7 +788,7 @@ public class DefaultCodegen implements CodegenConfig { //override with any special handling of the entire OpenAPI spec document @SuppressWarnings("unused") - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { if (useOneOfInterfaces) { // we process the openapi schema here to find oneOf schemas and create interface models for them Map schemas = new HashMap(openAPI.getComponents().getSchemas()); @@ -870,7 +870,7 @@ public class DefaultCodegen implements CodegenConfig { // override with any special handling of the entire OpenAPI spec document @SuppressWarnings("unused") - public void processOpenAPI(OpenAPI openAPI) { + public void processOpenAPI() { } // override with any special handling of the JMustache compiler diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 26062026031..3ddb9f12113 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -112,6 +112,8 @@ public class DefaultGenerator implements Generator { this.openAPI = opts.getOpenAPI(); this.modelUtils = new ModelUtils(openAPI); this.config = opts.getConfig(); + this.config.setOpenAPI(this.openAPI); + List userFiles = opts.getUserDefinedTemplates(); if (userFiles != null) { this.userDefinedTemplates = ImmutableList.copyOf(userFiles); @@ -255,10 +257,7 @@ public class DefaultGenerator implements Generator { } config.processOpts(); - config.preprocessOpenAPI(openAPI); - - // set OpenAPI to make these available to all methods - config.setOpenAPI(openAPI); + config.preprocessOpenAPI(); config.additionalProperties().put("generatorVersion", ImplementationVersion.read()); config.additionalProperties().put("generatedDate", ZonedDateTime.now().toString()); @@ -863,13 +862,13 @@ public class DefaultGenerator implements Generator { } // resolve inline models - InlineModelResolver inlineModelResolver = new InlineModelResolver(); - inlineModelResolver.flatten(openAPI); + InlineModelResolver inlineModelResolver = new InlineModelResolver(openAPI); + inlineModelResolver.flatten(); configureGeneratorProperties(); configureOpenAPIInfo(); - config.processOpenAPI(openAPI); + config.processOpenAPI(); processUserDefinedTemplates(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java index f69502c9358..9b07ce45b56 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java @@ -38,7 +38,7 @@ import java.util.*; import java.util.stream.Collectors; public class InlineModelResolver { - private OpenAPI openapi; + private OpenAPI openAPI; private ModelUtils modelUtils; private Map addedModels = new HashMap(); private Map generatedSignature = new HashMap(); @@ -55,28 +55,36 @@ public class InlineModelResolver { static final Logger LOGGER = LoggerFactory.getLogger(InlineModelResolver.class); - void flatten(OpenAPI openapi) { - this.openapi = openapi; - this.modelUtils = new ModelUtils(openapi); + public InlineModelResolver(OpenAPI openAPI) { + this.openAPI = openAPI; + this.modelUtils = new ModelUtils(openAPI); + } - if (openapi.getComponents() == null) { - openapi.setComponents(new Components()); + public OpenAPI getOpenAPI() { + return this.openAPI; + } + + public ModelUtils getModelUtils() { + return this.modelUtils; + } + + void flatten() { + if (openAPI.getComponents() == null) { + openAPI.setComponents(new Components()); } - if (openapi.getComponents().getSchemas() == null) { - openapi.getComponents().setSchemas(new HashMap()); + if (openAPI.getComponents().getSchemas() == null) { + openAPI.getComponents().setSchemas(new HashMap()); } - flattenPaths(openapi); - flattenComponents(openapi); + flattenPaths(); + flattenComponents(); } /** * Flatten inline models in Paths - * - * @param openAPI target spec */ - private void flattenPaths(OpenAPI openAPI) { + private void flattenPaths() { Paths paths = openAPI.getPaths(); if (paths == null) { return; @@ -98,9 +106,9 @@ public class InlineModelResolver { } for (Operation operation : operations) { - flattenRequestBody(openAPI, pathname, operation); - flattenParameters(openAPI, pathname, operation); - flattenResponses(openAPI, pathname, operation); + flattenRequestBody(pathname, operation); + flattenParameters(pathname, operation); + flattenResponses(pathname, operation); } } } @@ -108,11 +116,10 @@ public class InlineModelResolver { /** * Flatten inline models in RequestBody * - * @param openAPI target spec - * @param pathname target pathname + * @param pathname target pathname * @param operation target operation */ - private void flattenRequestBody(OpenAPI openAPI, String pathname, Operation operation) { + private void flattenRequestBody(String pathname, Operation operation) { RequestBody requestBody = operation.getRequestBody(); if (requestBody == null) { return; @@ -123,7 +130,7 @@ public class InlineModelResolver { Schema obj = (Schema) model; if (obj.getType() == null || "object".equals(obj.getType())) { if (obj.getProperties() != null && obj.getProperties().size() > 0) { - flattenProperties(openAPI, obj.getProperties(), pathname); + flattenProperties(obj.getProperties(), pathname); // for model name, use "title" if defined, otherwise default to 'inline_object' String modelName = resolveModelName(obj.getTitle(), "inline_object"); addGenerated(modelName, model); @@ -165,7 +172,6 @@ public class InlineModelResolver { // update requestBody to use $ref instead of inline def requestBody.set$ref(modelName); - } } } else if (model instanceof ArraySchema) { @@ -174,10 +180,10 @@ public class InlineModelResolver { if (inner instanceof ObjectSchema) { ObjectSchema op = (ObjectSchema) inner; if (op.getProperties() != null && op.getProperties().size() > 0) { - flattenProperties(openAPI, op.getProperties(), pathname); + flattenProperties(op.getProperties(), pathname); // Generate a unique model name based on the title. String modelName = resolveModelName(op.getTitle(), null); - Schema innerModel = modelFromProperty(openAPI, op, modelName); + Schema innerModel = modelFromProperty(op, modelName); String existing = matchGenerated(innerModel); if (existing != null) { Schema schema = new Schema().$ref(existing); @@ -198,11 +204,10 @@ public class InlineModelResolver { /** * Flatten inline models in parameters * - * @param openAPI target spec - * @param pathname target pathname + * @param pathname target pathname * @param operation target operation */ - private void flattenParameters(OpenAPI openAPI, String pathname, Operation operation) { + private void flattenParameters(String pathname, Operation operation) { List parameters = operation.getParameters(); if (parameters == null) { return; @@ -218,7 +223,7 @@ public class InlineModelResolver { Schema obj = (Schema) model; if (obj.getType() == null || "object".equals(obj.getType())) { if (obj.getProperties() != null && obj.getProperties().size() > 0) { - flattenProperties(openAPI, obj.getProperties(), pathname); + flattenProperties(obj.getProperties(), pathname); String modelName = resolveModelName(obj.getTitle(), parameter.getName()); parameter.$ref(modelName); @@ -232,9 +237,9 @@ public class InlineModelResolver { if (inner instanceof ObjectSchema) { ObjectSchema op = (ObjectSchema) inner; if (op.getProperties() != null && op.getProperties().size() > 0) { - flattenProperties(openAPI, op.getProperties(), pathname); + flattenProperties(op.getProperties(), pathname); String modelName = resolveModelName(op.getTitle(), parameter.getName()); - Schema innerModel = modelFromProperty(openAPI, op, modelName); + Schema innerModel = modelFromProperty(op, modelName); String existing = matchGenerated(innerModel); if (existing != null) { Schema schema = new Schema().$ref(existing); @@ -256,11 +261,10 @@ public class InlineModelResolver { /** * Flatten inline models in ApiResponses * - * @param openAPI target spec - * @param pathname target pathname + * @param pathname target pathname * @param operation target operation */ - private void flattenResponses(OpenAPI openAPI, String pathname, Operation operation) { + private void flattenResponses(String pathname, Operation operation) { ApiResponses responses = operation.getResponses(); if (responses == null) { return; @@ -277,7 +281,7 @@ public class InlineModelResolver { ObjectSchema op = (ObjectSchema) property; if (op.getProperties() != null && op.getProperties().size() > 0) { String modelName = resolveModelName(op.getTitle(), "inline_response_" + key); - Schema model = modelFromProperty(openAPI, op, modelName); + Schema model = modelFromProperty(op, modelName); String existing = matchGenerated(model); Content content = response.getContent(); for (MediaType mediaType : content.values()) { @@ -300,10 +304,10 @@ public class InlineModelResolver { if (inner instanceof ObjectSchema) { ObjectSchema op = (ObjectSchema) inner; if (op.getProperties() != null && op.getProperties().size() > 0) { - flattenProperties(openAPI, op.getProperties(), pathname); + flattenProperties(op.getProperties(), pathname); String modelName = resolveModelName(op.getTitle(), "inline_response_" + key); - Schema innerModel = modelFromProperty(openAPI, op, modelName); + Schema innerModel = modelFromProperty(op, modelName); String existing = matchGenerated(innerModel); if (existing != null) { Schema schema = this.makeSchema(existing, op); @@ -324,10 +328,10 @@ public class InlineModelResolver { if (innerProperty instanceof ObjectSchema) { ObjectSchema op = (ObjectSchema) innerProperty; if (op.getProperties() != null && op.getProperties().size() > 0) { - flattenProperties(openAPI, op.getProperties(), pathname); + flattenProperties(op.getProperties(), pathname); String modelName = resolveModelName(op.getTitle(), "inline_response_" + key); - Schema innerModel = modelFromProperty(openAPI, op, modelName); + Schema innerModel = modelFromProperty(op, modelName); String existing = matchGenerated(innerModel); if (existing != null) { Schema schema = new Schema().$ref(existing); @@ -350,30 +354,29 @@ public class InlineModelResolver { * Flattens properties of inline object schemas that belong to a composed schema into a * single flat list of properties. This is useful to generate a single or multiple * inheritance model. - * + *

* In the example below, codegen may generate a 'Dog' class that extends from the * generated 'Animal' class. 'Dog' has additional properties 'name', 'age' and 'breed' that * are flattened as a single list of properties. - * + *

* Dog: - * allOf: - * - $ref: '#/components/schemas/Animal' - * - type: object - * properties: - * name: - * type: string - * age: - * type: string - * - type: object - * properties: - * breed: - * type: string + * allOf: + * - $ref: '#/components/schemas/Animal' + * - type: object + * properties: + * name: + * type: string + * age: + * type: string + * - type: object + * properties: + * breed: + * type: string * - * @param openAPI the OpenAPI document - * @param key a unique name ofr the composed schema. + * @param key a unique name ofr the composed schema. * @param children the list of nested schemas within a composed schema (allOf, anyOf, oneOf). */ - private void flattenComposedChildren(OpenAPI openAPI, String key, List children) { + private void flattenComposedChildren(String key, List children) { if (children == null || children.isEmpty()) { return; } @@ -396,7 +399,7 @@ public class InlineModelResolver { // To have complete control of the model naming, one can define the model separately // instead of inline. String innerModelName = resolveModelName(op.getTitle(), key); - Schema innerModel = modelFromProperty(openAPI, op, innerModelName); + Schema innerModel = modelFromProperty(op, innerModelName); String existing = matchGenerated(innerModel); if (existing == null) { openAPI.getComponents().addSchemas(innerModelName, innerModel); @@ -418,10 +421,8 @@ public class InlineModelResolver { /** * Flatten inline models in components - * - * @param openAPI target spec */ - private void flattenComponents(OpenAPI openAPI) { + private void flattenComponents() { Map models = openAPI.getComponents().getSchemas(); if (models == null) { return; @@ -433,13 +434,13 @@ public class InlineModelResolver { if (modelUtils.isComposedSchema(model)) { ComposedSchema m = (ComposedSchema) model; // inline child schemas - flattenComposedChildren(openAPI, modelName + "_allOf", m.getAllOf()); - flattenComposedChildren(openAPI, modelName + "_anyOf", m.getAnyOf()); - flattenComposedChildren(openAPI, modelName + "_oneOf", m.getOneOf()); + flattenComposedChildren(modelName + "_allOf", m.getAllOf()); + flattenComposedChildren(modelName + "_anyOf", m.getAnyOf()); + flattenComposedChildren(modelName + "_oneOf", m.getOneOf()); } else if (model instanceof Schema) { Schema m = (Schema) model; Map properties = m.getProperties(); - flattenProperties(openAPI, properties, modelName); + flattenProperties(properties, modelName); fixStringModel(m); } else if (modelUtils.isArraySchema(model)) { ArraySchema m = (ArraySchema) model; @@ -448,7 +449,7 @@ public class InlineModelResolver { ObjectSchema op = (ObjectSchema) inner; if (op.getProperties() != null && op.getProperties().size() > 0) { String innerModelName = resolveModelName(op.getTitle(), modelName + "_inner"); - Schema innerModel = modelFromProperty(openAPI, op, innerModelName); + Schema innerModel = modelFromProperty(op, innerModelName); String existing = matchGenerated(innerModel); if (existing == null) { openAPI.getComponents().addSchemas(innerModelName, innerModel); @@ -485,12 +486,11 @@ public class InlineModelResolver { /** * Generates a unique model name. Non-alphanumeric characters will be replaced * with underscores - * + *

* e.g. io.schema.User_name => io_schema_User_name * * @param title String title field in the schema if present - * @param key String model name - * + * @param key String model name * @return if provided the sanitized {@code title}, else the sanitized {@code key} */ private String resolveModelName(String title, String key) { @@ -529,24 +529,24 @@ public class InlineModelResolver { /** * Sanitizes the input so that it's valid name for a class or interface - * + *

* e.g. 12.schema.User name => _2_schema_User_name */ private String sanitizeName(final String name) { return name - .replaceAll("^[0-9]", "_") // e.g. 12object => _2object - .replaceAll("[^A-Za-z0-9]", "_"); // e.g. io.schema.User name => io_schema_User_name + .replaceAll("^[0-9]", "_") // e.g. 12object => _2object + .replaceAll("[^A-Za-z0-9]", "_"); // e.g. io.schema.User name => io_schema_User_name } private String uniqueName(final String name) { - if (openapi.getComponents().getSchemas() == null) { + if (openAPI.getComponents().getSchemas() == null) { return name; } String uniqueName = name; int count = 0; while (true) { - if (!openapi.getComponents().getSchemas().containsKey(uniqueName)) { + if (!openAPI.getComponents().getSchemas().containsKey(uniqueName)) { return uniqueName; } uniqueName = name + "_" + ++count; @@ -554,7 +554,7 @@ public class InlineModelResolver { // TODO it would probably be a good idea to check against a list of used uniqueNames to make sure there are no collisions } - private void flattenProperties(OpenAPI openAPI, Map properties, String path) { + private void flattenProperties(Map properties, String path) { if (properties == null) { return; } @@ -566,7 +566,7 @@ public class InlineModelResolver { && ((ObjectSchema) property).getProperties().size() > 0) { ObjectSchema op = (ObjectSchema) property; String modelName = resolveModelName(op.getTitle(), path + "_" + key); - Schema model = modelFromProperty(openAPI, op, modelName); + Schema model = modelFromProperty(op, modelName); String existing = matchGenerated(model); if (existing != null) { Schema schema = new Schema().$ref(existing); @@ -578,7 +578,7 @@ public class InlineModelResolver { propsToUpdate.put(key, schema); modelsToAdd.put(modelName, model); addGenerated(modelName, model); - openapi.getComponents().addSchemas(modelName, model); + openAPI.getComponents().addSchemas(modelName, model); } } else if (property instanceof ArraySchema) { ArraySchema ap = (ArraySchema) property; @@ -586,9 +586,9 @@ public class InlineModelResolver { if (inner instanceof ObjectSchema) { ObjectSchema op = (ObjectSchema) inner; if (op.getProperties() != null && op.getProperties().size() > 0) { - flattenProperties(openAPI, op.getProperties(), path); + flattenProperties(op.getProperties(), path); String modelName = resolveModelName(op.getTitle(), path + "_" + key); - Schema innerModel = modelFromProperty(openAPI, op, modelName); + Schema innerModel = modelFromProperty(op, modelName); String existing = matchGenerated(innerModel); if (existing != null) { Schema schema = new Schema().$ref(existing); @@ -599,7 +599,7 @@ public class InlineModelResolver { schema.setRequired(op.getRequired()); ap.setItems(schema); addGenerated(modelName, innerModel); - openapi.getComponents().addSchemas(modelName, innerModel); + openAPI.getComponents().addSchemas(modelName, innerModel); } } } @@ -609,9 +609,9 @@ public class InlineModelResolver { if (inner instanceof ObjectSchema) { ObjectSchema op = (ObjectSchema) inner; if (op.getProperties() != null && op.getProperties().size() > 0) { - flattenProperties(openAPI, op.getProperties(), path); + flattenProperties(op.getProperties(), path); String modelName = resolveModelName(op.getTitle(), path + "_" + key); - Schema innerModel = modelFromProperty(openAPI, op, modelName); + Schema innerModel = modelFromProperty(op, modelName); String existing = matchGenerated(innerModel); if (existing != null) { Schema schema = new Schema().$ref(existing); @@ -622,7 +622,7 @@ public class InlineModelResolver { schema.setRequired(op.getRequired()); property.setAdditionalProperties(schema); addGenerated(modelName, innerModel); - openapi.getComponents().addSchemas(modelName, innerModel); + openAPI.getComponents().addSchemas(modelName, innerModel); } } } @@ -634,12 +634,12 @@ public class InlineModelResolver { } } for (String key : modelsToAdd.keySet()) { - openapi.getComponents().addSchemas(key, modelsToAdd.get(key)); + openAPI.getComponents().addSchemas(key, modelsToAdd.get(key)); this.addedModels.put(key, modelsToAdd.get(key)); } } - private Schema modelFromProperty(OpenAPI openAPI, Schema object, String path) { + private Schema modelFromProperty(Schema object, String path) { String description = object.getDescription(); String example = null; Object obj = object.getExample(); @@ -688,7 +688,7 @@ public class InlineModelResolver { model.setDeprecated(object.getDeprecated()); if (properties != null) { - flattenProperties(openAPI, properties, path); + flattenProperties(properties, path); model.setProperties(properties); } return model; @@ -717,7 +717,7 @@ public class InlineModelResolver { private void copyVendorExtensions(Schema source, Schema target) { Map vendorExtensions = source.getExtensions(); if (vendorExtensions == null) { - return; + return; } for (String extName : vendorExtensions.keySet()) { target.addExtension(extName, vendorExtensions.get(extName)); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java index 82b52e72d64..5c9bb2d167b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java @@ -326,7 +326,7 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { URL url = URLPathUtils.getServerURL(openAPI, serverVariableOverrides()); String port = URLPathUtils.getPort(url, ""); String host = url.getHost(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 1b989264a6f..de26b303504 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -1200,8 +1200,8 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); if (openAPI == null) { return; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java index eef2d352c96..eca682a6b53 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java @@ -127,8 +127,8 @@ public abstract class AbstractJavaJAXRSServerCodegen extends AbstractJavaCodegen } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); /* TODO there should be no need for the following logic if ("/".equals(swagger.getBasePath())) { swagger.setBasePath(""); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java index baa8d935478..e280318735a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java @@ -372,7 +372,7 @@ public abstract class AbstractPythonConnexionServerCodegen extends DefaultCodege } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { // need vendor extensions for x-openapi-router-controller Map paths = openAPI.getPaths(); if (paths != null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index 0f50c948358..e8eb486bd56 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -269,7 +269,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { if (additionalProperties.containsKey(NPM_NAME)) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java index 88b244f6f95..8cbd12de1d6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java @@ -158,7 +158,7 @@ public class ApexClientCodegen extends AbstractApexCodegen { } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { String calloutLabel = openAPI.getInfo().getTitle(); if (StringUtils.isNotBlank(namedCredential)) { calloutLabel = namedCredential; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java index db3b11e4267..38ef12c4389 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AsciidocDocumentationCodegen.java @@ -359,14 +359,14 @@ public class AsciidocDocumentationCodegen extends DefaultCodegen implements Code } @Override - public void processOpenAPI(OpenAPI openAPI) { + public void processOpenAPI() { if (this.includeSpecMarkupLambda != null) { LOGGER.debug("specs: " + ": " + this.includeSpecMarkupLambda.resetCounter()); } if (this.includeSnippetMarkupLambda != null) { LOGGER.debug("snippets: " + ": " + this.includeSnippetMarkupLambda.resetCounter()); } - super.processOpenAPI(openAPI); + super.processOpenAPI(); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java index ba7009ea99f..6827fbf00c7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java @@ -304,8 +304,8 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen { } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); URL url = URLPathUtils.getServerURL(openAPI, serverVariableOverrides()); additionalProperties.put("serverHost", url.getHost()); additionalProperties.put("serverPort", URLPathUtils.getPort(url, 8080)); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java index 4026c75cf98..77f6d805949 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java @@ -697,8 +697,8 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig { * @param openAPI [description] */ @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); /* TODO need to revise the logic below if ("/".equals(openAPI.getServers())) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java index e84ef3e2f94..9d25a665e4d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java @@ -716,7 +716,7 @@ public class CLibcurlClientCodegen extends DefaultCodegen implements CodegenConf } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { if (openAPI.getInfo() != null) { Info info = openAPI.getInfo(); setProjectName((escapeText(info.getTitle()))); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java index f862b31437e..f680b71b456 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java @@ -373,7 +373,7 @@ public class CSharpNancyFXServerCodegen extends AbstractCSharpCodegen { } @Override - public void preprocessOpenAPI(final OpenAPI openAPI) { + public void preprocessOpenAPI() { URL url = URLPathUtils.getServerURL(openAPI, serverVariableOverrides()); String path = URLPathUtils.getPath(url, "/"); final String packageContextOption = (String) additionalProperties.get(PACKAGE_CONTEXT); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java index 990c4bae7ea..5551107d66a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java @@ -216,8 +216,8 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); if (additionalProperties.containsKey(PROJECT_NAME)) { projectName = ((String) additionalProperties.get(PROJECT_NAME)); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java index 86e47f6723d..d133bfb5f4c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java @@ -264,7 +264,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { Info info = openAPI.getInfo(); if (moduleName == null) { if (info.getTitle() != null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java index 9985f428bff..2c0b85efd7d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java @@ -166,8 +166,8 @@ public class FsharpGiraffeServerCodegen extends AbstractFSharpCodegen { } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); URL url = URLPathUtils.getServerURL(openAPI, serverVariableOverrides()); additionalProperties.put("serverHost", url.getHost()); additionalProperties.put("serverPort", URLPathUtils.getPort(url, 8080)); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java index 47895fc1eb6..f97c2db47aa 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java @@ -519,7 +519,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { String baseTitle = openAPI.getInfo().getTitle(); if (baseTitle == null) { @@ -612,7 +612,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC additionalProperties.put(X_HAS_IMPORT_MAPPINGS, true); } - super.preprocessOpenAPI(openAPI); + super.preprocessOpenAPI(); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java index 9d068c4c649..608d30a8da0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java @@ -268,7 +268,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { // From the title, compute a reasonable name for the package and the API String title = openAPI.getInfo().getTitle(); @@ -325,7 +325,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf // See docstring for setGenerateToSchema for why we do this additionalProperties.put("generateToSchema", true); - super.preprocessOpenAPI(openAPI); + super.preprocessOpenAPI(); } /** diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java index fb0dc35efc9..4f41a8e06b8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java @@ -147,7 +147,7 @@ public class JMeterClientCodegen extends DefaultCodegen implements CodegenConfig } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { if (openAPI != null && openAPI.getPaths() != null) { for (String pathname : openAPI.getPaths().keySet()) { PathItem path = openAPI.getPaths().get(pathname); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java index 7354d1fda7d..0d8b4d4b53f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java @@ -454,8 +454,8 @@ public class JavaPKMSTServerCodegen extends AbstractJavaCodegen { @SuppressWarnings("unchecked") @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); if (openAPI == null || openAPI.getPaths() == null) { return; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java index fe44c4e9bab..21d2028c9d4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java @@ -223,8 +223,8 @@ public class JavaVertXServerCodegen extends AbstractJavaCodegen { } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); // add server port from the swagger file, 8080 by default URL url = URLPathUtils.getServerURL(openAPI, serverVariableOverrides()); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java index a9b98bd35d1..ccb9a6a65f9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java @@ -255,8 +255,8 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); if (openAPI.getInfo() != null) { Info info = openAPI.getInfo(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java index eda56edd76b..c8b5363e457 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java @@ -281,8 +281,8 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); if (openAPI.getInfo() != null) { Info info = openAPI.getInfo(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java index 6d050696c24..77515764560 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java @@ -112,8 +112,8 @@ public class JavascriptClosureAngularClientCodegen extends DefaultCodegen implem } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); if (useEs6) { embeddedTemplateDir = templateDir = "Javascript-Closure-Angular/es6"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java index 84c10840c44..a3f5d93b5b6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java @@ -136,8 +136,8 @@ public class JavascriptFlowtypedClientCodegen extends AbstractTypeScriptClientCo } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); if (openAPI.getInfo() != null) { Info info = openAPI.getInfo(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java index 85f3d208f19..702f0a1e036 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java @@ -238,8 +238,8 @@ public class K6ClientCodegen extends DefaultCodegen implements CodegenConfig { } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); if (openAPI.getInfo() != null) { Info info = openAPI.getInfo(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index 909c1f59cf2..06cfba48aa9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -474,8 +474,8 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); if (!additionalProperties.containsKey(TITLE)) { // The purpose of the title is for: diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java index 4141155ff78..c292ca71724 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java @@ -325,7 +325,7 @@ public class NodeJSExpressServerCodegen extends DefaultCodegen implements Codege } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { URL url = URLPathUtils.getServerURL(openAPI, serverVariableOverrides()); String host = URLPathUtils.getProtocolAndHost(url); String port = URLPathUtils.getPort(url, defaultServerPort); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java index 971e834ceed..ba74ea90b47 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java @@ -422,7 +422,7 @@ public class OCamlClientCodegen extends DefaultCodegen implements CodegenConfig } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { collectEnumSchemas(openAPI); supportingFiles.add(new SupportingFile("lib.mustache", "", packageName + ".opam")); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIGenerator.java index 04f08dadaa9..e23fe7e2652 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIGenerator.java @@ -83,7 +83,7 @@ public class OpenAPIGenerator extends DefaultCodegen implements CodegenConfig { } @Override - public void processOpenAPI(OpenAPI openAPI) { + public void processOpenAPI() { String jsonOpenAPI = SerializerUtils.toJsonString(openAPI); try { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java index 89827d40246..12203bf99dd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java @@ -174,8 +174,8 @@ public class PhpZendExpressivePathHandlerServerCodegen extends AbstractPhpCodege * @param openAPI OpenAPI object */ @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); Map paths = openAPI.getPaths(); if (paths != null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java index 4a31746ae3b..a3ae9ee145f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java @@ -333,7 +333,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig { } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { Info info = openAPI.getInfo(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java index ac4cb783768..2ca6ed25b74 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java @@ -250,7 +250,7 @@ public class ScalaGatlingCodegen extends AbstractScalaCodegen implements Codegen * @param openAPI input openapi document */ @Override - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { for (String pathname : openAPI.getPaths().keySet()) { PathItem path = openAPI.getPaths().get(pathname); if (path.readOperations() == null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index a985f1bdebd..f86f409e463 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -524,8 +524,8 @@ public class SpringCodegen extends AbstractJavaCodegen } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); /* TODO the following logic should not need anymore in OAS 3.0 if ("/".equals(swagger.getBasePath())) { swagger.setBasePath(""); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java index 295145bce09..3dca5c8d763 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java @@ -158,8 +158,8 @@ public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfi } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void preprocessOpenAPI() { + super.preprocessOpenAPI(); if (openAPI.getInfo() != null) { Info info = openAPI.getInfo(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java index 28eccde24a0..8b57cc52837 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java @@ -203,7 +203,7 @@ public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig } } - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { Info info = openAPI.getInfo(); info.setDescription(toHtml(info.getDescription())); info.setTitle(toHtml(info.getTitle())); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java index 74c0c29b237..e3566bb57ec 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java @@ -249,7 +249,7 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { + public void preprocessOpenAPI() { if (additionalProperties.containsKey(NPM_NAME)) { 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 66392526344..0b226bbe376 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 @@ -1538,7 +1538,7 @@ public class DefaultCodegenTest { @Test public void testNullableProperty() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/examples.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); final DefaultCodegen codegen = new DefaultCodegen(); codegen.setOpenAPI(openAPI); @@ -1550,7 +1550,7 @@ public class DefaultCodegenTest { @Test public void testDeprecatedModel() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/component-deprecated.yml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); final DefaultCodegen codegen = new DefaultCodegen(); CodegenModel codedenPetModel = codegen.fromModel("Pet", openAPI.getComponents().getSchemas().get("Pet")); @@ -1563,7 +1563,7 @@ public class DefaultCodegenTest { @Test public void testDeprecatedProperty() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/property-deplicated.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); final DefaultCodegen codegen = new DefaultCodegen(); codegen.setOpenAPI(openAPI); @@ -1579,7 +1579,7 @@ public class DefaultCodegenTest { @Test public void testDeprecatedRef() { final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/model-deprecated.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); final DefaultCodegen codegen = new DefaultCodegen(); codegen.setOpenAPI(openAPI); @@ -1752,7 +1752,7 @@ public class DefaultCodegenTest { @Test public void testAlias() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/type_alias.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); final DefaultCodegen codegen = new DefaultCodegen(); codegen.setOpenAPI(openAPI); @@ -1854,7 +1854,7 @@ public class DefaultCodegenTest { @Test public void objectQueryParamIdentifyAsObject() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/objectQueryParam.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); final DefaultCodegen codegen = new DefaultCodegen(); codegen.setOpenAPI(openAPI); @@ -1959,7 +1959,7 @@ public class DefaultCodegenTest { @Test public void arrayInnerReferencedSchemaMarkedAsModel_30() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/arrayRefBody.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); final DefaultCodegen codegen = new DefaultCodegen(); codegen.setOpenAPI(openAPI); @@ -2013,7 +2013,7 @@ public class DefaultCodegenTest { 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); + new InlineModelResolver(openAPI).flatten(); final DefaultCodegen codegen = new DefaultCodegen(); codegen.setOpenAPI(openAPI); @@ -2143,7 +2143,7 @@ public class DefaultCodegenTest { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/composed-oneof.yaml"); final DefaultCodegen cg = new DefaultCodegen(); cg.setUseOneOfInterfaces(true); - cg.preprocessOpenAPI(openAPI); + cg.preprocessOpenAPI(); // assert names of the response/request schema oneOf interfaces are as expected Assert.assertEquals( @@ -2226,7 +2226,7 @@ public class DefaultCodegenTest { final DefaultCodegen cg = new DefaultCodegen(); cg.setOpenAPI(openAPI); cg.setUseOneOfInterfaces(true); - cg.preprocessOpenAPI(openAPI); + cg.preprocessOpenAPI(); final PathItem path = openAPI.getPaths().get("/users/me"); final CodegenOperation operation = cg.fromOperation( diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ExampleGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ExampleGeneratorTest.java index 661ddb2fb65..765dc0fecd5 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ExampleGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ExampleGeneratorTest.java @@ -14,7 +14,7 @@ public class ExampleGeneratorTest { public void generateFromResponseSchemaWithPrimitiveType() { OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/example_generator_test.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ExampleGenerator exampleGenerator = new ExampleGenerator(openAPI.getComponents().getSchemas(), openAPI); Set mediaTypeKeys = new TreeSet<>(); @@ -43,7 +43,7 @@ public class ExampleGeneratorTest { public void generateFromResponseSchemaWithNoExample() { OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/example_generator_test.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ExampleGenerator exampleGenerator = new ExampleGenerator(openAPI.getComponents().getSchemas(), openAPI); Set mediaTypeKeys = new TreeSet<>(); @@ -69,7 +69,7 @@ public class ExampleGeneratorTest { public void generateFromResponseSchemaWithArrayOfModel() { OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/example_generator_test.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ExampleGenerator exampleGenerator = new ExampleGenerator(openAPI.getComponents().getSchemas(), openAPI); Set mediaTypeKeys = new TreeSet<>(); @@ -98,7 +98,7 @@ public class ExampleGeneratorTest { public void generateFromResponseSchemaWithArrayOfPrimitiveTypes() { OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/example_generator_test.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ExampleGenerator exampleGenerator = new ExampleGenerator(openAPI.getComponents().getSchemas(), openAPI); Set mediaTypeKeys = new TreeSet<>(); @@ -127,7 +127,7 @@ public class ExampleGeneratorTest { public void generateFromResponseSchemaWithModel() { OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/example_generator_test.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ExampleGenerator exampleGenerator = new ExampleGenerator(openAPI.getComponents().getSchemas(), openAPI); Set mediaTypeKeys = new TreeSet<>(); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java index a0a9e359c20..1efc074fba2 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java @@ -56,7 +56,7 @@ public class InlineModelResolverTest { assertNotNull((openapi.getComponents().getSchemas().get("User")).getProperties().get("address")); - new InlineModelResolver().flatten(openapi); + new InlineModelResolver(openapi).flatten(); Schema user = openapi.getComponents().getSchemas().get("User"); @@ -87,7 +87,7 @@ public class InlineModelResolverTest { .addProperties("street", new StringSchema()) .addProperties("city", new StringSchema()))); - new InlineModelResolver().flatten(openapi); + new InlineModelResolver(openapi).flatten(); Schema user = openapi.getComponents().getSchemas().get("User"); @@ -116,7 +116,7 @@ public class InlineModelResolverTest { .addProperties("street", new StringSchema()) .addProperties("city", new StringSchema()))); - new InlineModelResolver().flatten(openapi); + new InlineModelResolver(openapi).flatten(); Schema user = openapi.getComponents().getSchemas().get("User"); @@ -158,7 +158,7 @@ public class InlineModelResolverTest { .addProperties("street", new StringSchema()) .addProperties("city", new StringSchema()))); - new InlineModelResolver().flatten(openapi); + new InlineModelResolver(openapi).flatten(); ObjectSchema user = (ObjectSchema) openapi.getComponents().getSchemas().get("User"); @@ -203,7 +203,7 @@ public class InlineModelResolverTest { .addProperties("city", new StringSchema()) .addProperties("apartment", new StringSchema()))); - new InlineModelResolver().flatten(openapi); + new InlineModelResolver(openapi).flatten(); Schema user = openapi.getComponents().getSchemas().get("User"); @@ -246,7 +246,7 @@ public class InlineModelResolverTest { new MediaType().schema(new ObjectSchema() .addProperties("name", new StringSchema()).extensions(propExt)))))))); - new InlineModelResolver().flatten(openapi); + new InlineModelResolver(openapi).flatten(); Map responses = openapi.getPaths().get("/foo/bar").getGet().getResponses(); @@ -266,7 +266,7 @@ public class InlineModelResolverTest { @Test public void testInlineResponseModelType() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/6150_model_json_inline.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); Schema InlineResponse200 = openAPI.getComponents().getSchemas().get("inline_response_200"); assertEquals("object", InlineResponse200.getType()); @@ -305,7 +305,7 @@ public class InlineModelResolverTest { new MediaType().schema(new ObjectSchema() .addProperties("name", new StringSchema()).extensions(propExt)))))))); - new InlineModelResolver().flatten(openapi); + new InlineModelResolver(openapi).flatten(); Map responses = openapi.getPaths().get("/foo/bar").getGet().getResponses(); @@ -325,7 +325,7 @@ public class InlineModelResolverTest { @Test public void resolveInlineRequestBodyWhenNoComponents() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_request_body_no_components.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); assertNotNull(openAPI.getComponents()); assertNotNull(openAPI.getComponents().getRequestBodies()); @@ -334,7 +334,7 @@ public class InlineModelResolverTest { @Test public void resolveInlineArraySchemaWithTitle() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); assertTrue(openAPI.getComponents().getSchemas().get("Users") instanceof ArraySchema); @@ -350,7 +350,7 @@ public class InlineModelResolverTest { @Test public void resolveInlineRequestBody() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ModelUtils modelUtils = new ModelUtils(openAPI); RequestBody requestBodyReference = openAPI @@ -375,7 +375,7 @@ public class InlineModelResolverTest { @Test public void resolveInlineRequestBodyWithRequired() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ModelUtils modelUtils = new ModelUtils(openAPI); RequestBody requestBodyReference = openAPI.getPaths().get("/resolve_inline_request_body_with_required").getPost().getRequestBody(); @@ -388,7 +388,7 @@ public class InlineModelResolverTest { @Test public void resolveInlineRequestBodyWithTitle() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); RequestBody requestBodyReference = openAPI.getPaths().get("/resolve_inline_request_body_with_title").getPost().getRequestBody(); assertEquals("#/components/requestBodies/resolve_inline_request_body_with_title", requestBodyReference.get$ref()); @@ -397,7 +397,7 @@ public class InlineModelResolverTest { @Test public void nonModelRequestBody() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); MediaType mediaType = openAPI .getPaths() @@ -415,7 +415,7 @@ public class InlineModelResolverTest { @Test public void resolveInlineArrayRequestBody() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ModelUtils modelUtils = new ModelUtils(openAPI); MediaType mediaType = openAPI @@ -440,7 +440,7 @@ public class InlineModelResolverTest { @Test public void resolveInlineArrayRequestBodyWithTitle() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ArraySchema requestBodySchema = (ArraySchema) openAPI .getPaths() @@ -458,7 +458,7 @@ public class InlineModelResolverTest { @Test public void resolveInlineArrayResponse() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ModelUtils modelUtils = new ModelUtils(openAPI); MediaType mediaType = openAPI @@ -482,7 +482,7 @@ public class InlineModelResolverTest { @Test public void resolveInlineArrayResponseWithTitle() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); MediaType mediaType = openAPI .getPaths() @@ -500,7 +500,7 @@ public class InlineModelResolverTest { @Test public void resolveInlineObjectResponseWithAdditionalProperties() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ModelUtils modelUtils = new ModelUtils(openAPI); MediaType mediaType = openAPI @@ -551,7 +551,7 @@ public class InlineModelResolverTest { ) ); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ModelUtils modelUtils = new ModelUtils(openAPI); MediaType mediaType = openAPI @@ -581,7 +581,7 @@ public class InlineModelResolverTest { @Test public void arbitraryObjectRequestBody() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); MediaType mediaType = openAPI .getPaths() @@ -597,7 +597,7 @@ public class InlineModelResolverTest { @Test public void arbitraryObjectRequestBodyProperty() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); MediaType mediaType = openAPI .getPaths() @@ -616,7 +616,7 @@ public class InlineModelResolverTest { @Test public void arbitraryRequestBodyArray() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); MediaType mediaType = openAPI .getPaths() @@ -636,7 +636,7 @@ public class InlineModelResolverTest { @Test public void arbitraryRequestBodyArrayProperty() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ModelUtils modelUtils = new ModelUtils(openAPI); MediaType mediaType = openAPI @@ -659,7 +659,7 @@ public class InlineModelResolverTest { @Test public void arbitraryObjectResponse() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); MediaType mediaType = openAPI .getPaths() @@ -677,7 +677,7 @@ public class InlineModelResolverTest { @Test public void arbitraryObjectResponseArray() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); MediaType mediaType = openAPI .getPaths() @@ -696,7 +696,7 @@ public class InlineModelResolverTest { @Test public void arbitraryObjectResponseArrayInline() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ModelUtils modelUtils = new ModelUtils(openAPI); MediaType mediaType = openAPI @@ -722,7 +722,7 @@ public class InlineModelResolverTest { @Test public void arbitraryObjectResponseWithAdditionalProperty() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); MediaType mediaType = openAPI .getPaths() @@ -743,7 +743,7 @@ public class InlineModelResolverTest { @Test public void arbitraryObjectModelInline() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ObjectSchema model = (ObjectSchema) openAPI.getComponents().getSchemas().get("ArbitraryObjectModelInline"); assertTrue(model.getProperties().get("arbitrary_object_model_inline") instanceof ObjectSchema); @@ -755,7 +755,7 @@ public class InlineModelResolverTest { @Test public void arbitraryObjectModelWithArrayInlineWithoutTitle() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); assertTrue(openAPI.getComponents().getSchemas().get("ArbitraryObjectModelWithArrayInlineWithoutTitle") instanceof ArraySchema); @@ -783,7 +783,7 @@ public class InlineModelResolverTest { @Test public void objectComposedWithInline() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); assertTrue(openAPI.getComponents().getSchemas().get("ComposedObjectModelInline") instanceof ComposedSchema); @@ -798,7 +798,7 @@ public class InlineModelResolverTest { @Test public void inheritanceWithInlineDiscriminator() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/regression_6905.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ModelUtils modelUtils = new ModelUtils(openAPI); assertTrue(openAPI.getComponents().getSchemas().get("PartyType") instanceof StringSchema); @@ -901,7 +901,7 @@ public class InlineModelResolverTest { @Test public void arbitraryObjectModelWithArrayInlineWithTitle() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); assertTrue(openAPI.getComponents().getSchemas().get("ArbitraryObjectModelWithArrayInlineWithTitle") instanceof ArraySchema); @@ -920,7 +920,7 @@ public class InlineModelResolverTest { @Test public void emptyExampleOnStringTypeModels() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ModelUtils modelUtils = new ModelUtils(openAPI); MediaType mediaType = openAPI @@ -944,7 +944,7 @@ public class InlineModelResolverTest { @Test public void nullable() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ModelUtils modelUtils = new ModelUtils(openAPI); Schema nullablePropertyReference = (Schema) openAPI.getComponents().getSchemas().get("InlinePropertyIsNullable").getProperties().get("nullable_property"); @@ -969,7 +969,7 @@ public class InlineModelResolverTest { @Test public void callbacks() { OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml"); - new InlineModelResolver().flatten(openAPI); + new InlineModelResolver(openAPI).flatten(); ModelUtils modelUtils = new ModelUtils(openAPI); RequestBody callbackRequestBodyReference = openAPI diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java index 237978dc247..b8b6ddcae2c 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java @@ -42,8 +42,8 @@ public class TestUtils { */ public static OpenAPI parseFlattenSpec(String specFilePath) { OpenAPI openAPI = parseSpec(specFilePath); - InlineModelResolver inlineModelResolver = new InlineModelResolver(); - inlineModelResolver.flatten(openAPI); + InlineModelResolver inlineModelResolver = new InlineModelResolver(openAPI); + inlineModelResolver.flatten(); return openAPI; } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/asciidoc/AsciidocGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/asciidoc/AsciidocGeneratorTest.java index 91ab4f87bea..4699475e6fa 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/asciidoc/AsciidocGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/asciidoc/AsciidocGeneratorTest.java @@ -32,7 +32,7 @@ public class AsciidocGeneratorTest { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/ping.yaml"); AsciidocDocumentationCodegen codeGen = new AsciidocDocumentationCodegen(); - codeGen.preprocessOpenAPI(openAPI); + codeGen.preprocessOpenAPI(); Assert.assertEquals(openAPI.getInfo().getTitle(), "ping test"); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/html/StaticHtmlGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/html/StaticHtmlGeneratorTest.java index 2f70262d7f6..e30f0e397ed 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/html/StaticHtmlGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/html/StaticHtmlGeneratorTest.java @@ -51,7 +51,7 @@ public class StaticHtmlGeneratorTest { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/ping.yaml"); final StaticHtmlGenerator codegen = new StaticHtmlGenerator(); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(openAPI.getInfo().getTitle(), "ping test"); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java index 2d8e8cfdf6a..1319a4253d0 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java @@ -68,7 +68,7 @@ public class AbstractJavaCodegenTest { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/petstore.yaml"); final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getArtifactVersion(), openAPI.getInfo().getVersion()); Assert.assertEquals(openAPI.getPaths().get("/pet").getPost().getExtensions().get("x-accepts"), "application/json"); @@ -79,7 +79,7 @@ public class AbstractJavaCodegenTest { final OpenAPI openAPIOtherNumVersion = TestUtils.parseFlattenSpec("src/test/resources/2_0/duplicateOperationIds.yaml"); final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); - codegen.preprocessOpenAPI(openAPIOtherNumVersion); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getArtifactVersion(), openAPIOtherNumVersion.getInfo().getVersion()); } @@ -128,7 +128,7 @@ public class AbstractJavaCodegenTest { final AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); codegen.processOpts(); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE); Assert.assertEquals(codegen.isHideGenerationTimestamp(), false); @@ -157,7 +157,7 @@ public class AbstractJavaCodegenTest { codegen.setArtifactVersion("0.9.0-SNAPSHOT"); codegen.processOpts(); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE); Assert.assertEquals(codegen.isHideGenerationTimestamp(), true); @@ -184,7 +184,7 @@ public class AbstractJavaCodegenTest { codegen.additionalProperties().put(AbstractJavaCodegen.BOOLEAN_GETTER_PREFIX, "getBoolean"); codegen.additionalProperties().put(CodegenConstants.ARTIFACT_VERSION, "0.8.0-SNAPSHOT"); codegen.processOpts(); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE); @@ -258,7 +258,7 @@ public class AbstractJavaCodegenTest { OpenAPI api = TestUtils.createOpenAPI(); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getArtifactVersion(), "1.0.7"); } @@ -271,7 +271,7 @@ public class AbstractJavaCodegenTest { OpenAPI api = TestUtils.createOpenAPI(); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getArtifactVersion(), "1.0.7-SNAPSHOT"); } @@ -284,7 +284,7 @@ public class AbstractJavaCodegenTest { OpenAPI api = TestUtils.createOpenAPI(); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getArtifactVersion(), "1.1.1"); } @@ -298,7 +298,7 @@ public class AbstractJavaCodegenTest { OpenAPI api = TestUtils.createOpenAPI(); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getArtifactVersion(), "1.1.1-SNAPSHOT"); } @@ -311,7 +311,7 @@ public class AbstractJavaCodegenTest { OpenAPI api = TestUtils.createOpenAPI(); api.getInfo().setVersion(null); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getArtifactVersion(), "1.0.0"); } @@ -325,7 +325,7 @@ public class AbstractJavaCodegenTest { OpenAPI api = TestUtils.createOpenAPI(); api.getInfo().setVersion(null); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getArtifactVersion(), "1.0.0-SNAPSHOT"); } @@ -339,7 +339,7 @@ public class AbstractJavaCodegenTest { OpenAPI api = TestUtils.createOpenAPI(); api.getInfo().setVersion("2.0"); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getArtifactVersion(), "2.0-SNAPSHOT"); } @@ -353,7 +353,7 @@ public class AbstractJavaCodegenTest { OpenAPI api = TestUtils.createOpenAPI(); api.getInfo().setVersion(null); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getArtifactVersion(), version); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.ARTIFACT_VERSION), version); @@ -368,7 +368,7 @@ public class AbstractJavaCodegenTest { OpenAPI api = TestUtils.createOpenAPI(); api.getInfo().setVersion("1.2.3-SNAPSHOT"); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getArtifactVersion(), version); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.ARTIFACT_VERSION), version); @@ -385,7 +385,7 @@ public class AbstractJavaCodegenTest { codegen.additionalProperties().put(CodegenConstants.ARTIFACT_VERSION, null); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getArtifactVersion(), version); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.ARTIFACT_VERSION), version); @@ -402,7 +402,7 @@ public class AbstractJavaCodegenTest { OpenAPI api = TestUtils.createOpenAPI(); codegen.setArtifactVersion("4.1.2-SNAPSHOT"); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getArtifactVersion(), "4.1.2-SNAPSHOT"); } @@ -526,7 +526,7 @@ public class AbstractJavaCodegenTest { final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/petstore.yaml"); codegen.additionalProperties().put(CodegenConstants.SNAPSHOT_VERSION, "true"); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertTrue((boolean) codegen.additionalProperties().get(CodegenConstants.SNAPSHOT_VERSION)); } @@ -535,7 +535,7 @@ public class AbstractJavaCodegenTest { final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/petstore.yaml"); codegen.additionalProperties().put(CodegenConstants.SNAPSHOT_VERSION, true); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertTrue((boolean) codegen.additionalProperties().get(CodegenConstants.SNAPSHOT_VERSION)); } @@ -544,7 +544,7 @@ public class AbstractJavaCodegenTest { final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/petstore.yaml"); codegen.additionalProperties().put(CodegenConstants.SNAPSHOT_VERSION, "false"); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertFalse((boolean) codegen.additionalProperties().get(CodegenConstants.SNAPSHOT_VERSION)); } @@ -553,7 +553,7 @@ public class AbstractJavaCodegenTest { final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/petstore.yaml"); codegen.additionalProperties().put(CodegenConstants.SNAPSHOT_VERSION, false); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertFalse((boolean) codegen.additionalProperties().get(CodegenConstants.SNAPSHOT_VERSION)); } @@ -562,7 +562,7 @@ public class AbstractJavaCodegenTest { final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/petstore.yaml"); codegen.additionalProperties().put(CodegenConstants.SNAPSHOT_VERSION, "blibb"); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertFalse((boolean) codegen.additionalProperties().get(CodegenConstants.SNAPSHOT_VERSION)); } @@ -571,7 +571,7 @@ public class AbstractJavaCodegenTest { final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/petstore.yaml"); codegen.additionalProperties().put(CodegenConstants.SNAPSHOT_VERSION, 42L); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertFalse((boolean) codegen.additionalProperties().get(CodegenConstants.SNAPSHOT_VERSION)); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/AbstractJavaJAXRSServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/AbstractJavaJAXRSServerCodegenTest.java index 7aaf1ac6c38..e1e7ca37249 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/AbstractJavaJAXRSServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/AbstractJavaJAXRSServerCodegenTest.java @@ -48,7 +48,7 @@ public class AbstractJavaJAXRSServerCodegenTest { OpenAPI openAPI = new OpenAPI(); openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2")); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE); Assert.assertEquals(codegen.isHideGenerationTimestamp(), false); @@ -92,7 +92,7 @@ public class AbstractJavaJAXRSServerCodegenTest { OpenAPI openAPI = new OpenAPI(); openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2")); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE); Assert.assertEquals(codegen.isHideGenerationTimestamp(), true); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java index 03b472b2212..1207eab8d1e 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java @@ -296,7 +296,7 @@ public class JavaJAXRSCXFExtServerCodegenTest extends JavaJaxrsBaseTest { OpenAPI openAPI = new OpenAPI(); openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2")); - testerCodegen.preprocessOpenAPI(openAPI); + testerCodegen.preprocessOpenAPI(); // Options processed by DefaultCodegen assertEquals(testerCodegen.getAllowUnicodeIdentifiers(), Boolean.TRUE); @@ -462,7 +462,7 @@ public class JavaJAXRSCXFExtServerCodegenTest extends JavaJaxrsBaseTest { OpenAPI openAPI = new OpenAPI(); openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2")); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Map additionalProperties = codegen.additionalProperties(); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java index 8e802fd7a0b..346530ea65b 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java @@ -53,7 +53,7 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest { OpenAPI openAPI = new OpenAPI(); openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2")); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE); Assert.assertEquals(codegen.isHideGenerationTimestamp(), false); @@ -103,7 +103,7 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest { OpenAPI openAPI = new OpenAPI(); openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2")); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE); Assert.assertEquals(codegen.isHideGenerationTimestamp(), true); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java index fb950fbe552..b414fe097d1 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java @@ -45,7 +45,7 @@ public class JavaJerseyServerCodegenTest extends JavaJaxrsBaseTest { OpenAPI openAPI = new OpenAPI(); openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2")); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE); Assert.assertEquals(codegen.isHideGenerationTimestamp(), false); @@ -87,7 +87,7 @@ public class JavaJerseyServerCodegenTest extends JavaJaxrsBaseTest { OpenAPI openAPI = new OpenAPI(); openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2")); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE); Assert.assertEquals(codegen.isHideGenerationTimestamp(), true); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 3e8d8977209..bd61d1bada3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -354,7 +354,7 @@ public class SpringCodegenTest { openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2")); openAPI.setInfo(new Info()); openAPI.getInfo().setTitle("Some test API"); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE); Assert.assertEquals(codegen.isHideGenerationTimestamp(), true); @@ -451,7 +451,7 @@ public class SpringCodegenTest { OpenAPI openAPI = new OpenAPI(); openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2")); openAPI.setInfo(new Info()); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE); Assert.assertEquals(codegen.isHideGenerationTimestamp(), false); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index b77afc858f9..ba756093cd1 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -48,7 +48,7 @@ public class KotlinSpringServerCodegenTest { final OpenAPI openAPI = new OpenAPI(); openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2")); openAPI.setInfo(new Info()); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getLibrary(), KotlinSpringServerCodegen.SPRING_BOOT); Assert.assertTrue(codegen.supportedLibraries().containsKey(KotlinSpringServerCodegen.SPRING_BOOT)); @@ -125,7 +125,7 @@ public class KotlinSpringServerCodegenTest { openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2")); openAPI.setInfo(new Info()); openAPI.getInfo().setTitle("Some test API"); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.modelPackage(), "xyz.yyyyy.mmmmm.model"); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xyz.yyyyy.mmmmm.model"); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java index c9aa302746f..56e86fd2585 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java @@ -20,7 +20,7 @@ public class TypeScriptFetchClientCodegenTest { codegen.additionalProperties().put("snapshot", true); codegen.additionalProperties().put("npmVersion", "1.0.0-SNAPSHOT"); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertTrue(codegen.getNpmVersion().matches("^1.0.0-SNAPSHOT.[0-9]{12}$")); @@ -29,7 +29,7 @@ public class TypeScriptFetchClientCodegenTest { codegen.additionalProperties().put("snapshot", true); codegen.additionalProperties().put("npmVersion", "3.0.0-M1"); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertTrue(codegen.getNpmVersion().matches("^3.0.0-M1-SNAPSHOT.[0-9]{12}$")); @@ -44,7 +44,7 @@ public class TypeScriptFetchClientCodegenTest { codegen.additionalProperties().put("snapshot", false); codegen.additionalProperties().put("npmVersion", "1.0.0-SNAPSHOT"); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertTrue(codegen.getNpmVersion().matches("^1.0.0-SNAPSHOT$")); @@ -53,7 +53,7 @@ public class TypeScriptFetchClientCodegenTest { codegen.additionalProperties().put("snapshot", false); codegen.additionalProperties().put("npmVersion", "3.0.0-M1"); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertTrue(codegen.getNpmVersion().matches("^3.0.0-M1$")); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularClientCodegenTest.java index 059e5004ad4..591b9010e93 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularClientCodegenTest.java @@ -127,7 +127,7 @@ public class TypeScriptAngularClientCodegenTest { codegen.additionalProperties().put("snapshot", true); codegen.additionalProperties().put("npmVersion", "1.0.0-SNAPSHOT"); codegen.processOpts(); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertTrue(codegen.getNpmVersion().matches("^1.0.0-SNAPSHOT.[0-9]{12}$")); @@ -136,7 +136,7 @@ public class TypeScriptAngularClientCodegenTest { codegen.additionalProperties().put("snapshot", true); codegen.additionalProperties().put("npmVersion", "3.0.0-M1"); codegen.processOpts(); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertTrue(codegen.getNpmVersion().matches("^3.0.0-M1-SNAPSHOT.[0-9]{12}$")); @@ -151,7 +151,7 @@ public class TypeScriptAngularClientCodegenTest { codegen.additionalProperties().put("snapshot", false); codegen.additionalProperties().put("npmVersion", "1.0.0-SNAPSHOT"); codegen.processOpts(); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertTrue(codegen.getNpmVersion().matches("^1.0.0-SNAPSHOT$")); @@ -160,7 +160,7 @@ public class TypeScriptAngularClientCodegenTest { codegen.additionalProperties().put("snapshot", false); codegen.additionalProperties().put("npmVersion", "3.0.0-M1"); codegen.processOpts(); - codegen.preprocessOpenAPI(openAPI); + codegen.preprocessOpenAPI(); Assert.assertTrue(codegen.getNpmVersion().matches("^3.0.0-M1$")); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypescriptAngularApiVersionTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypescriptAngularApiVersionTest.java index a5779813146..70c35a3077e 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypescriptAngularApiVersionTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypescriptAngularApiVersionTest.java @@ -16,7 +16,7 @@ public class TypescriptAngularApiVersionTest { OpenAPI api = TestUtils.createOpenAPI(); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getNpmVersion(), "1.0.7"); } @@ -30,7 +30,7 @@ public class TypescriptAngularApiVersionTest { OpenAPI api = TestUtils.createOpenAPI(); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getNpmVersion(), "2.0.0"); } @@ -44,7 +44,7 @@ public class TypescriptAngularApiVersionTest { OpenAPI api = TestUtils.createOpenAPI(); api.getInfo().setVersion(null); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertEquals(codegen.getNpmVersion(), "1.0.0"); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeClientCodegenTest.java index d48db3981e4..091394188a0 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeClientCodegenTest.java @@ -39,7 +39,7 @@ public class TypeScriptNodeClientCodegenTest { codegen.additionalProperties().put("snapshot", true); codegen.additionalProperties().put("npmVersion", "1.0.0-SNAPSHOT"); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertTrue(codegen.getNpmVersion().matches("^1.0.0-SNAPSHOT.[0-9]{12}$")); @@ -48,7 +48,7 @@ public class TypeScriptNodeClientCodegenTest { codegen.additionalProperties().put("snapshot", true); codegen.additionalProperties().put("npmVersion", "3.0.0-M1"); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertTrue(codegen.getNpmVersion().matches("^3.0.0-M1-SNAPSHOT.[0-9]{12}$")); } @@ -62,7 +62,7 @@ public class TypeScriptNodeClientCodegenTest { codegen.additionalProperties().put("snapshot", false); codegen.additionalProperties().put("npmVersion", "1.0.0-SNAPSHOT"); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertTrue(codegen.getNpmVersion().matches("^1.0.0-SNAPSHOT$")); @@ -71,7 +71,7 @@ public class TypeScriptNodeClientCodegenTest { codegen.additionalProperties().put("snapshot", false); codegen.additionalProperties().put("npmVersion", "3.0.0-M1"); codegen.processOpts(); - codegen.preprocessOpenAPI(api); + codegen.preprocessOpenAPI(); Assert.assertTrue(codegen.getNpmVersion().matches("^3.0.0-M1$")); }