From 12768ab1d6705543eccac122f74f925cf7b6f55b Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Mon, 3 Jan 2022 08:31:09 -0500 Subject: [PATCH 01/14] recursively search for types during import type collection in deeply nested schemas #11220 --- .../openapitools/codegen/DefaultCodegen.java | 30 +++++++++++++---- .../codegen/DefaultCodegenTest.java | 10 ++++++ .../additional-properties-deeply-nested.yaml | 32 +++++++++++++++++++ 3 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/additional-properties-deeply-nested.yaml 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 1af3ddbba392..4a77d96ea370 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 @@ -5121,11 +5121,19 @@ private static String generateNextName(String name) { } protected void addImport(CodegenModel m, String type) { - if (type != null && needToImport(type)) { - m.imports.add(type); + addImport(m.imports, type); + } + + private void addImport(Set imports, String type) { + if (shouldAddImport(type)) { + imports.add(type); } } + private boolean shouldAddImport(String type) { + return type != null && needToImport(type); + } + /** * Loop through properties and unalias the reference if $ref (reference) is defined * @@ -5262,17 +5270,25 @@ protected void addVars(IJsonSchemaValidationProperties m, List * @param property The codegen representation of the OAS schema's property. */ protected void addImportsForPropertyType(CodegenModel model, CodegenProperty property) { - // TODO revise the logic to include map if (property.isContainer) { - addImport(model, typeMapping.get("array")); + addImport(model.imports, typeMapping.get("array")); } + model.imports.addAll(getImportsForPropertyType(property, true)); + } - addImport(model, property.baseType); + private Set getImportsForPropertyType(CodegenProperty property, boolean includeContainerTypes) { + Set imports = new HashSet<>(); + if (includeContainerTypes || !property.isContainer) { + addImport(imports, property.baseType); + } CodegenProperty innerCp = property; while (innerCp != null) { - addImport(model, innerCp.complexType); + if (includeContainerTypes || !property.isContainer) { + addImport(imports, innerCp.complexType); + } innerCp = innerCp.items; } + return imports; } /** @@ -6727,6 +6743,8 @@ protected LinkedHashMap getContent(Content content, Se CodegenProperty schemaProp = fromProperty(toMediaTypeSchemaName(contentType, mediaTypeSchemaSuffix), mt.getSchema()); CodegenMediaType codegenMt = new CodegenMediaType(schemaProp, ceMap); cmtContent.put(contentType, codegenMt); + Set importsToAdd = getImportsForPropertyType(schemaProp, false); + imports.addAll(importsToAdd); } return cmtContent; } 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 54a2b0d20530..4e9fcd6397b4 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 @@ -56,6 +56,16 @@ public class DefaultCodegenTest { + @Test + public void testDeeplyNestedAdditionalPropertiesImports() { + final DefaultCodegen codegen = new DefaultCodegen(); + final OpenAPI openApi = TestUtils.parseFlattenSpec("src/test/resources/3_0/additional-properties-deeply-nested.yaml"); + codegen.setOpenAPI(openApi); + PathItem path = openApi.getPaths().get("/ping"); + CodegenOperation operation = codegen.fromOperation("/ping", "post", path.getPost(), path.getServers()); + Assert.assertEquals(Sets.intersection(operation.imports, Sets.newHashSet("Person")).size(), 1); + } + @Test public void testHasBodyParameter() { final Schema refSchema = new Schema<>().$ref("#/components/schemas/Pet"); diff --git a/modules/openapi-generator/src/test/resources/3_0/additional-properties-deeply-nested.yaml b/modules/openapi-generator/src/test/resources/3_0/additional-properties-deeply-nested.yaml new file mode 100644 index 000000000000..78d9c95b54a3 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/additional-properties-deeply-nested.yaml @@ -0,0 +1,32 @@ +openapi: 3.0.1 +info: + title: Test additional properties with ref + version: '1.0' +servers: + - url: 'http://localhost:8000/' +paths: + /ping: + post: + operationId: pingGet + responses: + default: + description: default response + content: + application/json: + schema: + type: object + additionalProperties: + type: object + additionalProperties: + type: object + additionalProperties: + "$ref": "#/components/schemas/Person" +components: + schemas: + Person: + type: object + properties: + lastName: + type: string + firstName: + type: string \ No newline at end of file From 3910036ff0cf6badd393b5943dc9d8c76471bae5 Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Tue, 4 Jan 2022 08:01:41 -0500 Subject: [PATCH 02/14] composed schema recursive type import handling --- .../codegen/CodegenParameter.java | 22 +++++++++++- .../openapitools/codegen/CodegenProperty.java | 12 ++++++- .../openapitools/codegen/DefaultCodegen.java | 34 +++++++++---------- .../org/openapitools/codegen/Importable.java | 14 ++++++++ .../TypeScriptClientCodegenTest.java | 13 +++++++ 5 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/Importable.java diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java index dba1721fbca2..6bda34f9ad53 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java @@ -24,7 +24,7 @@ * A unique parameter is defined by a combination of a name and location. * Parameters may be located in a path, query, header or cookie. */ -public class CodegenParameter implements IJsonSchemaValidationProperties { +public class CodegenParameter implements IJsonSchemaValidationProperties, Importable { public boolean isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, isDeepObject, isAllowEmptyValue; @@ -739,6 +739,11 @@ public CodegenComposedSchemas getComposedSchemas() { return composedSchemas; } + @Override + public Importable getInner() { + return null; + } + @Override public boolean getHasMultipleTypes() {return hasMultipleTypes; } @@ -756,5 +761,20 @@ public LinkedHashMap getContent() { public void setContent(LinkedHashMap content) { this.content = content; } + + @Override + public String getBaseType() { + return baseType; + } + + @Override + public String getComplexType() { + return baseType; + } + + @Override + public boolean isContainer() { + return isContainer; + } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java index 7c2430f47149..e37374a4e20f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java @@ -19,7 +19,7 @@ import java.util.*; -public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperties { +public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperties, Importable { /** * The value of the 'type' attribute in the OpenAPI schema. * The per-language codegen logic may change to a language-specific type. @@ -206,6 +206,11 @@ public String getComplexType() { return complexType; } + @Override + public boolean isContainer() { + return isContainer; + } + public void setComplexType(String complexType) { this.complexType = complexType; } @@ -626,6 +631,11 @@ public CodegenComposedSchemas getComposedSchemas() { return composedSchemas; } + @Override + public Importable getInner() { + return items; + } + @Override public CodegenProperty clone() { try { 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 4a77d96ea370..b1b0b1b3e996 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 @@ -5276,17 +5276,22 @@ protected void addImportsForPropertyType(CodegenModel model, CodegenProperty pro model.imports.addAll(getImportsForPropertyType(property, true)); } - private Set getImportsForPropertyType(CodegenProperty property, boolean includeContainerTypes) { + private Set getImportsForPropertyType(Importable importable, boolean includeContainerTypes) { Set imports = new HashSet<>(); - if (includeContainerTypes || !property.isContainer) { - addImport(imports, property.baseType); - } - CodegenProperty innerCp = property; - while (innerCp != null) { - if (includeContainerTypes || !property.isContainer) { - addImport(imports, innerCp.complexType); + if (importable != null) { + if (includeContainerTypes || !importable.isContainer()) { + if (importable.getComposedSchemas() != null) { + CodegenComposedSchemas composed = (CodegenComposedSchemas) importable.getComposedSchemas(); + List allOfs = composed.getAllOf() == null ? Collections.emptyList() : composed.getAllOf(); + List oneOfs = composed.getOneOf() == null ? Collections.emptyList() : composed.getOneOf(); + Stream innerTypes = Stream.concat(allOfs.stream(), oneOfs.stream()); + innerTypes.flatMap(cp -> getImportsForPropertyType(cp, includeContainerTypes).stream()).forEach(s -> addImport(imports, s)); + } else { + addImport(imports, importable.getComplexType()); + addImport(imports, importable.getBaseType()); + } } - innerCp = innerCp.items; + imports.addAll(getImportsForPropertyType(importable.getInner(), includeContainerTypes)); } return imports; } @@ -6380,11 +6385,7 @@ public CodegenParameter fromFormProperty(String name, Schema propertySchema, Set // default to csv: codegenParameter.collectionFormat = StringUtils.isEmpty(collectionFormat) ? "csv" : collectionFormat; - // recursively add import - while (arrayInnerProperty != null) { - imports.add(arrayInnerProperty.baseType); - arrayInnerProperty = arrayInnerProperty.items; - } + imports.addAll(getImportsForPropertyType(arrayInnerProperty, true)); } else { // referenced schemas ; @@ -6411,10 +6412,7 @@ public CodegenParameter fromFormProperty(String name, Schema propertySchema, Set codegenParameter.enumName = codegenProperty.enumName; } - // import - if (codegenProperty.complexType != null) { - imports.add(codegenProperty.complexType); - } + imports.addAll(getImportsForPropertyType(codegenProperty, true)); setParameterExampleValue(codegenParameter); // set nullable diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/Importable.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/Importable.java new file mode 100644 index 000000000000..a6ae61ac5631 --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/Importable.java @@ -0,0 +1,14 @@ +package org.openapitools.codegen; + +import java.util.List; + +public interface Importable { + String getBaseType(); + String getComplexType(); + + boolean isContainer(); + + CodegenComposedSchemas getComposedSchemas(); + + Importable getInner(); +} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/TypeScriptClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/TypeScriptClientCodegenTest.java index 350af16ebb80..55c7b3b5efaa 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/TypeScriptClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/TypeScriptClientCodegenTest.java @@ -1,7 +1,10 @@ package org.openapitools.codegen.typescript; +import com.google.common.collect.Sets; import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.media.*; +import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.languages.TypeScriptClientCodegen; import org.openapitools.codegen.utils.ModelUtils; @@ -41,4 +44,14 @@ public void getTypeDeclarationTest() { Assert.assertEquals(codegen.getTypeDeclaration(parentSchema), "{ [key: string]: Child; }"); } + @Test + public void testComposedSchemasImportTypesIndividually() { + final TypeScriptClientCodegen codegen = new TypeScriptClientCodegen(); + final OpenAPI openApi = TestUtils.parseFlattenSpec("src/test/resources/3_0/composed-schemas.yaml"); + codegen.setOpenAPI(openApi); + PathItem path = openApi.getPaths().get("/pets"); + CodegenOperation operation = codegen.fromOperation("/pets", "patch", path.getPatch(), path.getServers()); + Assert.assertEquals(operation.imports, Sets.newHashSet("Cat", "Dog")); + } + } From 039e3e266dad77319dd28b9daea7e46b0fa9ef0e Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Fri, 7 Jan 2022 07:46:53 -0500 Subject: [PATCH 03/14] change Importable to ComplexType to modularize related type-wrangling. --- .../codegen/CodegenParameter.java | 7 +-- .../openapitools/codegen/CodegenProperty.java | 4 +- .../org/openapitools/codegen/ComplexType.java | 44 +++++++++++++++ .../openapitools/codegen/DefaultCodegen.java | 53 +++++++------------ .../org/openapitools/codegen/Importable.java | 14 ----- 5 files changed, 69 insertions(+), 53 deletions(-) create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java delete mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/Importable.java diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java index 6bda34f9ad53..366f33972e91 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java @@ -24,7 +24,7 @@ * A unique parameter is defined by a combination of a name and location. * Parameters may be located in a path, query, header or cookie. */ -public class CodegenParameter implements IJsonSchemaValidationProperties, Importable { +public class CodegenParameter implements IJsonSchemaValidationProperties, ComplexType { public boolean isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, isDeepObject, isAllowEmptyValue; @@ -740,8 +740,8 @@ public CodegenComposedSchemas getComposedSchemas() { } @Override - public Importable getInner() { - return null; + public ComplexType getInner() { + return items; } @Override @@ -769,6 +769,7 @@ public String getBaseType() { @Override public String getComplexType() { + // CodegenParameters don't store complexTypes. return baseType; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java index e37374a4e20f..72d2ce0a34ea 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java @@ -19,7 +19,7 @@ import java.util.*; -public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperties, Importable { +public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperties, ComplexType { /** * The value of the 'type' attribute in the OpenAPI schema. * The per-language codegen logic may change to a language-specific type. @@ -632,7 +632,7 @@ public CodegenComposedSchemas getComposedSchemas() { } @Override - public Importable getInner() { + public ComplexType getInner() { return items; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java new file mode 100644 index 000000000000..d6e2cb91944e --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java @@ -0,0 +1,44 @@ +package org.openapitools.codegen; + +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; + +public interface ComplexType { + String getBaseType(); + String getComplexType(); + + boolean isContainer(); + + CodegenComposedSchemas getComposedSchemas(); + + ComplexType getInner(); + + /** + * Recursively collect all necessary imports to include in order to resolve this type. + * + * @param includeContainerTypes + * @return + */ + default Set getImports(boolean includeContainerTypes) { + Set imports = new HashSet<>(); + if (includeContainerTypes || !this.isContainer()) { + if (this.getComposedSchemas() != null) { + CodegenComposedSchemas composed = (CodegenComposedSchemas) this.getComposedSchemas(); + List allOfs = composed.getAllOf() == null ? Collections.emptyList() : composed.getAllOf(); + List oneOfs = composed.getOneOf() == null ? Collections.emptyList() : composed.getOneOf(); + Stream innerTypes = Stream.concat(allOfs.stream(), oneOfs.stream()); + innerTypes.flatMap(cp -> cp.getImports(includeContainerTypes).stream()).forEach(s -> imports.add(s)); + } else { + imports.add(this.getComplexType()); + imports.add(this.getBaseType()); + } + } + if (this.getInner() !=null) { + imports.addAll(this.getInner().getImports(includeContainerTypes)); + } + return imports; + } +} 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 b1b0b1b3e996..49905e1459cb 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 @@ -2490,13 +2490,7 @@ protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map importsToBeAddedTo, ComplexType type) { + addImports(importsToBeAddedTo, type.getImports(true)); + } + + protected void addImports(Set importsToBeAddedTo, Set importsToAdd) { + importsToAdd.stream().forEach(i -> addImport(importsToBeAddedTo, i)); + } + protected void addImport(CodegenModel m, String type) { addImport(m.imports, type); } - private void addImport(Set imports, String type) { + private void addImport(Set importsToBeAddedTo, String type) { if (shouldAddImport(type)) { - imports.add(type); + importsToBeAddedTo.add(type); } } @@ -5273,27 +5279,7 @@ protected void addImportsForPropertyType(CodegenModel model, CodegenProperty pro if (property.isContainer) { addImport(model.imports, typeMapping.get("array")); } - model.imports.addAll(getImportsForPropertyType(property, true)); - } - - private Set getImportsForPropertyType(Importable importable, boolean includeContainerTypes) { - Set imports = new HashSet<>(); - if (importable != null) { - if (includeContainerTypes || !importable.isContainer()) { - if (importable.getComposedSchemas() != null) { - CodegenComposedSchemas composed = (CodegenComposedSchemas) importable.getComposedSchemas(); - List allOfs = composed.getAllOf() == null ? Collections.emptyList() : composed.getAllOf(); - List oneOfs = composed.getOneOf() == null ? Collections.emptyList() : composed.getOneOf(); - Stream innerTypes = Stream.concat(allOfs.stream(), oneOfs.stream()); - innerTypes.flatMap(cp -> getImportsForPropertyType(cp, includeContainerTypes).stream()).forEach(s -> addImport(imports, s)); - } else { - addImport(imports, importable.getComplexType()); - addImport(imports, importable.getBaseType()); - } - } - imports.addAll(getImportsForPropertyType(importable.getInner(), includeContainerTypes)); - } - return imports; + addImports(model, property); } /** @@ -6385,7 +6371,7 @@ public CodegenParameter fromFormProperty(String name, Schema propertySchema, Set // default to csv: codegenParameter.collectionFormat = StringUtils.isEmpty(collectionFormat) ? "csv" : collectionFormat; - imports.addAll(getImportsForPropertyType(arrayInnerProperty, true)); + addImports(imports, arrayInnerProperty); } else { // referenced schemas ; @@ -6412,7 +6398,7 @@ public CodegenParameter fromFormProperty(String name, Schema propertySchema, Set codegenParameter.enumName = codegenProperty.enumName; } - imports.addAll(getImportsForPropertyType(codegenProperty, true)); + addImports(imports, codegenProperty); setParameterExampleValue(codegenParameter); // set nullable @@ -6741,8 +6727,7 @@ protected LinkedHashMap getContent(Content content, Se CodegenProperty schemaProp = fromProperty(toMediaTypeSchemaName(contentType, mediaTypeSchemaSuffix), mt.getSchema()); CodegenMediaType codegenMt = new CodegenMediaType(schemaProp, ceMap); cmtContent.put(contentType, codegenMt); - Set importsToAdd = getImportsForPropertyType(schemaProp, false); - imports.addAll(importsToAdd); + addImports(imports, schemaProp.getImports(false)); } return cmtContent; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/Importable.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/Importable.java deleted file mode 100644 index a6ae61ac5631..000000000000 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/Importable.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.openapitools.codegen; - -import java.util.List; - -public interface Importable { - String getBaseType(); - String getComplexType(); - - boolean isContainer(); - - CodegenComposedSchemas getComposedSchemas(); - - Importable getInner(); -} From 3613d54d22f9c34c5b4ef869bc8eff3e0be6e64d Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Fri, 7 Jan 2022 09:21:30 -0500 Subject: [PATCH 04/14] Problems... --- .../src/main/java/org/openapitools/client/model/Cat.java | 1 + .../src/main/java/org/openapitools/client/model/FruitReq.java | 1 + .../src/main/java/org/openapitools/client/model/ShapeOrNull.java | 1 + .../src/main/java/org/openapitools/client/model/Cat.java | 1 + .../src/main/java/org/openapitools/client/model/FruitReq.java | 1 + .../src/main/java/org/openapitools/client/model/ShapeOrNull.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApiController.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApiDelegate.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApiDelegate.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java | 1 + .../src/gen/java/org/openapitools/api/FakeApiService.java | 1 + .../main/java/org/openapitools/api/impl/FakeApiServiceImpl.java | 1 + .../app/controllers/FakeApiController.java | 1 + .../app/controllers/FakeApiControllerImp.java | 1 + .../app/controllers/FakeApiControllerImpInterface.java | 1 + .../jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java | 1 + .../src/gen/java/org/openapitools/api/FakeApi.java | 1 + .../src/gen/java/org/openapitools/api/FakeApiService.java | 1 + .../main/java/org/openapitools/api/impl/FakeApiServiceImpl.java | 1 + .../jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java | 1 + .../src/gen/java/org/openapitools/api/FakeApiService.java | 1 + .../main/java/org/openapitools/api/impl/FakeApiServiceImpl.java | 1 + .../src/gen/java/org/openapitools/api/FakeApi.java | 1 + .../jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java | 1 + .../src/gen/java/org/openapitools/api/FakeApi.java | 1 + .../src/gen/java/org/openapitools/api/FakeApiService.java | 1 + .../main/java/org/openapitools/api/impl/FakeApiServiceImpl.java | 1 + .../jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java | 1 + .../src/gen/java/org/openapitools/api/FakeApiService.java | 1 + .../main/java/org/openapitools/api/impl/FakeApiServiceImpl.java | 1 + .../src/gen/java/org/openapitools/api/FakeApi.java | 1 + .../src/gen/java/org/openapitools/api/FakeApiService.java | 1 + .../main/java/org/openapitools/api/impl/FakeApiServiceImpl.java | 1 + .../jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java | 1 + .../src/gen/java/org/openapitools/api/FakeApiService.java | 1 + .../main/java/org/openapitools/api/impl/FakeApiServiceImpl.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../spring-mvc/src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApiController.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApiDelegate.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApiDelegate.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApiDelegate.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApiController.java | 1 + .../src/main/java/org/openapitools/api/FakeApiDelegate.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApiDelegate.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApiController.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/api/FakeApi.java | 1 + .../src/main/java/org/openapitools/virtualan/api/FakeApi.java | 1 + .../springboot/src/main/java/org/openapitools/api/FakeApi.java | 1 + 68 files changed, 68 insertions(+) diff --git a/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/Cat.java index a81d5016bf72..ee2111486d08 100644 --- a/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/Cat.java @@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import java.util.Map; import org.openapitools.client.model.Animal; import org.openapitools.client.model.CatAllOf; diff --git a/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/FruitReq.java index abaf8b2fc6d8..35eaa5de8f03 100644 --- a/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/FruitReq.java @@ -26,6 +26,7 @@ import java.math.BigDecimal; import org.openapitools.client.model.AppleReq; import org.openapitools.client.model.BananaReq; +import org.openapitools.client.model.ModelNull; import javax.ws.rs.core.GenericType; diff --git a/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/ShapeOrNull.java index b48a29b873b7..2dde0d97b932 100644 --- a/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import org.openapitools.client.model.ModelNull; import org.openapitools.client.model.Quadrilateral; import org.openapitools.client.model.Triangle; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java index b99939ade459..831a5004bbff 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java @@ -30,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Map; import org.openapitools.client.model.Animal; import org.openapitools.client.model.CatAllOf; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java index e38b9e41f7c8..b026aec4e487 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java @@ -27,6 +27,7 @@ import java.math.BigDecimal; import org.openapitools.client.model.AppleReq; import org.openapitools.client.model.BananaReq; +import org.openapitools.client.model.ModelNull; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.openapitools.client.JSON; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java index 195c51dd975d..296d22051e45 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -30,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import org.openapitools.client.model.ModelNull; import org.openapitools.client.model.Quadrilateral; import org.openapitools.client.model.Triangle; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java index a9d785eaea31..fe5ae2a7f00b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import java.time.OffsetDateTime; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index d634215d030b..e4a3e7c16715 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java index 362ff5ff5e3a..4e7a37df1836 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java @@ -3,6 +3,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index a1667f68fd91..9bb2ba44fa04 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index d3a949e65d81..15fc2e9e93d0 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -3,6 +3,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 456caa3cf66f..171db4359aa6 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index 729f78eb8246..a2923da3277e 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java index dbe78fa1c7f9..e73bdc00688a 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -3,6 +3,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index 720457848da9..9b6a4060a5d7 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java index de8256e6923c..f1056bee072a 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java @@ -12,6 +12,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java index 01934c762cbb..2fc3d704eb8b 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java @@ -11,6 +11,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index 0e69a9a57318..7e67c02af191 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -8,6 +8,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java index 98e4052c8ed7..704357840a03 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java @@ -4,6 +4,7 @@ import apimodels.Client; import apimodels.FileSchemaTestClass; import java.io.InputStream; +import java.util.List; import java.time.LocalDate; import java.util.Map; import java.time.OffsetDateTime; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java index 0d999b3bde66..7922187d80c8 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java @@ -4,6 +4,7 @@ import apimodels.Client; import apimodels.FileSchemaTestClass; import java.io.InputStream; +import java.util.List; import java.time.LocalDate; import java.util.Map; import java.time.OffsetDateTime; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java index b7871b677ac6..02b5371f7033 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java @@ -4,6 +4,7 @@ import apimodels.Client; import apimodels.FileSchemaTestClass; import java.io.InputStream; +import java.util.List; import java.time.LocalDate; import java.util.Map; import java.time.OffsetDateTime; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java index 74f95d7a95d5..549b0fae4e3a 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java @@ -5,6 +5,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import org.joda.time.LocalDate; import java.util.Map; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java index efb4711d6d4c..cc1f2241a916 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java @@ -11,6 +11,7 @@ import org.openapitools.model.Client; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java index a3ab5e2e1518..7b67a785deee 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java @@ -9,6 +9,7 @@ import org.openapitools.model.Client; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index 40cfa39e7055..d699c90dc39e 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -7,6 +7,7 @@ import org.openapitools.model.Client; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java index 977a1d06f700..e87fcfcf8051 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java @@ -13,6 +13,7 @@ import java.io.File; import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.HealthCheckResult; +import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java index 1b48df160ffd..ed717f992dae 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java @@ -11,6 +11,7 @@ import java.io.File; import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.HealthCheckResult; +import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index 68be0aeef19e..e94ed7c669de 100644 --- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -9,6 +9,7 @@ import java.io.File; import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.HealthCheckResult; +import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java index 81535f05cdd2..e6bbb8ae1dbd 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java @@ -5,6 +5,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import org.joda.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java index c2dcc67b3a18..eb57256e59c0 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java @@ -5,6 +5,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import org.joda.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java index 6c784c0d2b8c..e465d77b9929 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java @@ -12,6 +12,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.OuterComposite; import org.openapitools.model.User; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java index 61cd6b21f539..d7c7e24d5d6e 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java @@ -10,6 +10,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.OuterComposite; import org.openapitools.model.User; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index 0010027de9c6..6d14b1277e98 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -10,6 +10,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.OuterComposite; import org.openapitools.model.User; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java index 6cd432d975ee..6437771b2eb8 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java @@ -12,6 +12,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java index ab7dfc9b067c..ab086c2e1ad7 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java @@ -10,6 +10,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index aafbec155af9..c4690d7e4b23 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -10,6 +10,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java index 7ac866dd64d4..4de6171c3b14 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java @@ -12,6 +12,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.OuterComposite; import org.openapitools.model.User; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java index b74ceeb26a3b..83377ba75553 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java @@ -10,6 +10,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.OuterComposite; import org.openapitools.model.User; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index a948630d2248..06e399d2006f 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -8,6 +8,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.OuterComposite; import org.openapitools.model.User; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java index 0a943c0e96a0..5352f863c7b3 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java @@ -12,6 +12,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java index 145a097c86c6..ad69e4b896c6 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java @@ -10,6 +10,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index 1a05630abc47..59f533387326 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -8,6 +8,7 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java index 5481edab7a72..b1d65e7a31ce 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java index bc0af05b90fe..f23fcca677be 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Map; diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index 71ffda67b0c2..53755276ca13 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index 14af6c292108..4af3dfbbff13 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java index 71ffda67b0c2..53755276ca13 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index ce2e0775f783..2cb830bc25c3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java index 76034668bf3c..527a832d3bf9 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java @@ -3,6 +3,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index 71ffda67b0c2..53755276ca13 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index 52267c039104..8293638c217d 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java index d3a949e65d81..15fc2e9e93d0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -3,6 +3,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 52267c039104..8293638c217d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index d3a949e65d81..15fc2e9e93d0 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -3,6 +3,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 940a74845194..cd33ef24a951 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index c01306b7fd40..f9109a4c1373 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java index dbe78fa1c7f9..e73bdc00688a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -3,6 +3,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 1030dcc870c8..16c0e2cd8f9a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiController.java index 76cc2bb95757..5f74757106d3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiController.java @@ -3,6 +3,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java index e88b7aa6ca50..d741054ea6e5 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -3,6 +3,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java index 0abbadcd381d..fb64151d5584 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java index de03df402674..808524d1173b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -3,6 +3,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 1030dcc870c8..16c0e2cd8f9a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApiController.java index 9a5306056e85..8b087fa4affe 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApiController.java @@ -3,6 +3,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index 14af6c292108..4af3dfbbff13 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index 8a9cd128c463..1b7bfe0125ba 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index 8cfa7936f844..b4f0d08ff65b 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.virtualan.model.Client; import org.openapitools.virtualan.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.virtualan.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java index 71ffda67b0c2..53755276ca13 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java @@ -8,6 +8,7 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; From 61263ffb4d2ebd73e0ba6e3a6afddce5a8d79d93 Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Fri, 7 Jan 2022 09:27:06 -0500 Subject: [PATCH 05/14] Revert "Problems..." This reverts commit 6154f202a0f4db7a706fe3d61b45573581d164d4. --- .../src/main/java/org/openapitools/client/model/Cat.java | 1 - .../src/main/java/org/openapitools/client/model/FruitReq.java | 1 - .../src/main/java/org/openapitools/client/model/ShapeOrNull.java | 1 - .../src/main/java/org/openapitools/client/model/Cat.java | 1 - .../src/main/java/org/openapitools/client/model/FruitReq.java | 1 - .../src/main/java/org/openapitools/client/model/ShapeOrNull.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApiController.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApiDelegate.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApiDelegate.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java | 1 - .../src/gen/java/org/openapitools/api/FakeApiService.java | 1 - .../main/java/org/openapitools/api/impl/FakeApiServiceImpl.java | 1 - .../app/controllers/FakeApiController.java | 1 - .../app/controllers/FakeApiControllerImp.java | 1 - .../app/controllers/FakeApiControllerImpInterface.java | 1 - .../jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java | 1 - .../src/gen/java/org/openapitools/api/FakeApi.java | 1 - .../src/gen/java/org/openapitools/api/FakeApiService.java | 1 - .../main/java/org/openapitools/api/impl/FakeApiServiceImpl.java | 1 - .../jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java | 1 - .../src/gen/java/org/openapitools/api/FakeApiService.java | 1 - .../main/java/org/openapitools/api/impl/FakeApiServiceImpl.java | 1 - .../src/gen/java/org/openapitools/api/FakeApi.java | 1 - .../jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java | 1 - .../src/gen/java/org/openapitools/api/FakeApi.java | 1 - .../src/gen/java/org/openapitools/api/FakeApiService.java | 1 - .../main/java/org/openapitools/api/impl/FakeApiServiceImpl.java | 1 - .../jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java | 1 - .../src/gen/java/org/openapitools/api/FakeApiService.java | 1 - .../main/java/org/openapitools/api/impl/FakeApiServiceImpl.java | 1 - .../src/gen/java/org/openapitools/api/FakeApi.java | 1 - .../src/gen/java/org/openapitools/api/FakeApiService.java | 1 - .../main/java/org/openapitools/api/impl/FakeApiServiceImpl.java | 1 - .../jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java | 1 - .../src/gen/java/org/openapitools/api/FakeApiService.java | 1 - .../main/java/org/openapitools/api/impl/FakeApiServiceImpl.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../spring-mvc/src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApiController.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApiDelegate.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApiDelegate.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApiDelegate.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApiController.java | 1 - .../src/main/java/org/openapitools/api/FakeApiDelegate.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApiDelegate.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApiController.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/virtualan/api/FakeApi.java | 1 - .../springboot/src/main/java/org/openapitools/api/FakeApi.java | 1 - 68 files changed, 68 deletions(-) diff --git a/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/Cat.java index ee2111486d08..a81d5016bf72 100644 --- a/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/Cat.java @@ -23,7 +23,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; -import java.util.Map; import org.openapitools.client.model.Animal; import org.openapitools.client.model.CatAllOf; diff --git a/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/FruitReq.java index 35eaa5de8f03..abaf8b2fc6d8 100644 --- a/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/FruitReq.java @@ -26,7 +26,6 @@ import java.math.BigDecimal; import org.openapitools.client.model.AppleReq; import org.openapitools.client.model.BananaReq; -import org.openapitools.client.model.ModelNull; import javax.ws.rs.core.GenericType; diff --git a/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/ShapeOrNull.java index 2dde0d97b932..b48a29b873b7 100644 --- a/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/client/petstore/java/okhttp-gson-nextgen/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -23,7 +23,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; -import org.openapitools.client.model.ModelNull; import org.openapitools.client.model.Quadrilateral; import org.openapitools.client.model.Triangle; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java index 831a5004bbff..b99939ade459 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java @@ -30,7 +30,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Map; import org.openapitools.client.model.Animal; import org.openapitools.client.model.CatAllOf; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java index b026aec4e487..e38b9e41f7c8 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java @@ -27,7 +27,6 @@ import java.math.BigDecimal; import org.openapitools.client.model.AppleReq; import org.openapitools.client.model.BananaReq; -import org.openapitools.client.model.ModelNull; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.openapitools.client.JSON; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java index 296d22051e45..195c51dd975d 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -30,7 +30,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.client.model.ModelNull; import org.openapitools.client.model.Quadrilateral; import org.openapitools.client.model.Triangle; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java index fe5ae2a7f00b..a9d785eaea31 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import java.time.OffsetDateTime; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index e4a3e7c16715..d634215d030b 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java index 4e7a37df1836..362ff5ff5e3a 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java @@ -3,7 +3,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 9bb2ba44fa04..a1667f68fd91 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index 15fc2e9e93d0..d3a949e65d81 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -3,7 +3,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 171db4359aa6..456caa3cf66f 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index a2923da3277e..729f78eb8246 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java index e73bdc00688a..dbe78fa1c7f9 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -3,7 +3,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index 9b6a4060a5d7..720457848da9 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java index f1056bee072a..de8256e6923c 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java @@ -12,7 +12,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java index 2fc3d704eb8b..01934c762cbb 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java @@ -11,7 +11,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index 7e67c02af191..0e69a9a57318 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -8,7 +8,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java index 704357840a03..98e4052c8ed7 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java @@ -4,7 +4,6 @@ import apimodels.Client; import apimodels.FileSchemaTestClass; import java.io.InputStream; -import java.util.List; import java.time.LocalDate; import java.util.Map; import java.time.OffsetDateTime; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java index 7922187d80c8..0d999b3bde66 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java @@ -4,7 +4,6 @@ import apimodels.Client; import apimodels.FileSchemaTestClass; import java.io.InputStream; -import java.util.List; import java.time.LocalDate; import java.util.Map; import java.time.OffsetDateTime; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java index 02b5371f7033..b7871b677ac6 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java @@ -4,7 +4,6 @@ import apimodels.Client; import apimodels.FileSchemaTestClass; import java.io.InputStream; -import java.util.List; import java.time.LocalDate; import java.util.Map; import java.time.OffsetDateTime; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java index 549b0fae4e3a..74f95d7a95d5 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java @@ -5,7 +5,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import org.joda.time.LocalDate; import java.util.Map; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java index cc1f2241a916..efb4711d6d4c 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java @@ -11,7 +11,6 @@ import org.openapitools.model.Client; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java index 7b67a785deee..a3ab5e2e1518 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java @@ -9,7 +9,6 @@ import org.openapitools.model.Client; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index d699c90dc39e..40cfa39e7055 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -7,7 +7,6 @@ import org.openapitools.model.Client; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java index e87fcfcf8051..977a1d06f700 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java @@ -13,7 +13,6 @@ import java.io.File; import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.HealthCheckResult; -import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java index ed717f992dae..1b48df160ffd 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java @@ -11,7 +11,6 @@ import java.io.File; import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.HealthCheckResult; -import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index e94ed7c669de..68be0aeef19e 100644 --- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -9,7 +9,6 @@ import java.io.File; import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.HealthCheckResult; -import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java index e6bbb8ae1dbd..81535f05cdd2 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java @@ -5,7 +5,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import org.joda.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java index eb57256e59c0..c2dcc67b3a18 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java @@ -5,7 +5,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import org.joda.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java index e465d77b9929..6c784c0d2b8c 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java @@ -12,7 +12,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.OuterComposite; import org.openapitools.model.User; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java index d7c7e24d5d6e..61cd6b21f539 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java @@ -10,7 +10,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.OuterComposite; import org.openapitools.model.User; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index 6d14b1277e98..0010027de9c6 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -10,7 +10,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.OuterComposite; import org.openapitools.model.User; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java index 6437771b2eb8..6cd432d975ee 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java @@ -12,7 +12,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java index ab086c2e1ad7..ab7dfc9b067c 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java @@ -10,7 +10,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index c4690d7e4b23..aafbec155af9 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -10,7 +10,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java index 4de6171c3b14..7ac866dd64d4 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java @@ -12,7 +12,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.OuterComposite; import org.openapitools.model.User; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java index 83377ba75553..b74ceeb26a3b 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java @@ -10,7 +10,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.OuterComposite; import org.openapitools.model.User; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index 06e399d2006f..a948630d2248 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -8,7 +8,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.OuterComposite; import org.openapitools.model.User; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java index 5352f863c7b3..0a943c0e96a0 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java @@ -12,7 +12,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java index ad69e4b896c6..145a097c86c6 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java @@ -10,7 +10,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index 59f533387326..1a05630abc47 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -8,7 +8,6 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java index b1d65e7a31ce..5481edab7a72 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java index f23fcca677be..bc0af05b90fe 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Map; diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index 53755276ca13..71ffda67b0c2 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index 4af3dfbbff13..14af6c292108 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java index 53755276ca13..71ffda67b0c2 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index 2cb830bc25c3..ce2e0775f783 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java index 527a832d3bf9..76034668bf3c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java @@ -3,7 +3,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index 53755276ca13..71ffda67b0c2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index 8293638c217d..52267c039104 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java index 15fc2e9e93d0..d3a949e65d81 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -3,7 +3,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 8293638c217d..52267c039104 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index 15fc2e9e93d0..d3a949e65d81 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -3,7 +3,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index cd33ef24a951..940a74845194 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index f9109a4c1373..c01306b7fd40 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java index e73bdc00688a..dbe78fa1c7f9 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -3,7 +3,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 16c0e2cd8f9a..1030dcc870c8 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiController.java index 5f74757106d3..76cc2bb95757 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiController.java @@ -3,7 +3,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java index d741054ea6e5..e88b7aa6ca50 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -3,7 +3,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java index fb64151d5584..0abbadcd381d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java index 808524d1173b..de03df402674 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -3,7 +3,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 16c0e2cd8f9a..1030dcc870c8 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApiController.java index 8b087fa4affe..9a5306056e85 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApiController.java @@ -3,7 +3,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import org.threeten.bp.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index 4af3dfbbff13..14af6c292108 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index 1b7bfe0125ba..8a9cd128c463 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index b4f0d08ff65b..8cfa7936f844 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.virtualan.model.Client; import org.openapitools.virtualan.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.virtualan.model.ModelApiResponse; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java index 53755276ca13..71ffda67b0c2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java @@ -8,7 +8,6 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import java.util.List; import java.time.LocalDate; import java.util.Map; import org.openapitools.model.ModelApiResponse; From 96a6ecda973ad86dc90e2c8f28c4e9910add59fc Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Fri, 7 Jan 2022 09:37:55 -0500 Subject: [PATCH 06/14] Reverted attempts to reuse recursive type-finding code. --- .../openapitools/codegen/DefaultCodegen.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) 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 49905e1459cb..8e7d674bd31a 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 @@ -2490,7 +2490,13 @@ protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map Date: Fri, 7 Jan 2022 09:56:09 -0500 Subject: [PATCH 07/14] add javadoc comments --- .../org/openapitools/codegen/ComplexType.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java index d6e2cb91944e..f4c4961d4b32 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java @@ -7,20 +7,37 @@ import java.util.stream.Stream; public interface ComplexType { + + /** + * @return basic type - no generics supported. + */ String getBaseType(); + + /** + * @return complex type that can contain type parameters - like {@code List} for Java + */ String getComplexType(); + /** + * @return true if set, map or list. + */ boolean isContainer(); + /** + * @return the composed schemas that might make up this type, null otherwise. + */ CodegenComposedSchemas getComposedSchemas(); + /** + * @return the inner type in the case of a type with type parameters + */ ComplexType getInner(); /** - * Recursively collect all necessary imports to include in order to resolve this type. + * Recursively collect all necessary imports to include so that the type may be resolved. * * @param includeContainerTypes - * @return + * @return all of the imports */ default Set getImports(boolean includeContainerTypes) { Set imports = new HashSet<>(); From 68ec26e6c3e9a5f205540290f70ac4ba892d7dbb Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Fri, 7 Jan 2022 10:57:38 -0500 Subject: [PATCH 08/14] fix javadoc warning. --- .../src/main/java/org/openapitools/codegen/ComplexType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java index f4c4961d4b32..d12749f4f85b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java @@ -36,7 +36,7 @@ public interface ComplexType { /** * Recursively collect all necessary imports to include so that the type may be resolved. * - * @param includeContainerTypes + * @param includeContainerTypes whether or not to include the container types in the returned imports. * @return all of the imports */ default Set getImports(boolean includeContainerTypes) { From 005b382212e2fcdef4d89a0083c75843db932e63 Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Fri, 7 Jan 2022 11:35:25 -0500 Subject: [PATCH 09/14] fix NPE --- .../main/java/org/openapitools/codegen/DefaultCodegen.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 8e7d674bd31a..36ee2966d28f 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 @@ -6740,7 +6740,9 @@ protected LinkedHashMap getContent(Content content, Se CodegenProperty schemaProp = fromProperty(toMediaTypeSchemaName(contentType, mediaTypeSchemaSuffix), mt.getSchema()); CodegenMediaType codegenMt = new CodegenMediaType(schemaProp, ceMap); cmtContent.put(contentType, codegenMt); - addImports(imports, schemaProp.getImports(false)); + if (schemaProp != null) { + addImports(imports, schemaProp.getImports(false)); + } } return cmtContent; } From 9aeee780a36b68ffff94f40dd4955797c7c61dc6 Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Thu, 13 Jan 2022 12:40:48 -0500 Subject: [PATCH 10/14] PR feedback incorporation --- .../codegen/CodegenParameter.java | 18 +----- .../openapitools/codegen/CodegenProperty.java | 12 +--- .../openapitools/codegen/CodegenResponse.java | 5 ++ .../org/openapitools/codegen/ComplexType.java | 61 ------------------- .../openapitools/codegen/DefaultCodegen.java | 4 +- .../IJsonSchemaValidationProperties.java | 44 +++++++++++++ 6 files changed, 53 insertions(+), 91 deletions(-) delete mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java index 366f33972e91..6d00e02103e2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java @@ -24,7 +24,7 @@ * A unique parameter is defined by a combination of a name and location. * Parameters may be located in a path, query, header or cookie. */ -public class CodegenParameter implements IJsonSchemaValidationProperties, ComplexType { +public class CodegenParameter implements IJsonSchemaValidationProperties { public boolean isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, isDeepObject, isAllowEmptyValue; @@ -739,11 +739,6 @@ public CodegenComposedSchemas getComposedSchemas() { return composedSchemas; } - @Override - public ComplexType getInner() { - return items; - } - @Override public boolean getHasMultipleTypes() {return hasMultipleTypes; } @@ -766,16 +761,5 @@ public void setContent(LinkedHashMap content) { public String getBaseType() { return baseType; } - - @Override - public String getComplexType() { - // CodegenParameters don't store complexTypes. - return baseType; - } - - @Override - public boolean isContainer() { - return isContainer; - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java index 72d2ce0a34ea..7c2430f47149 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java @@ -19,7 +19,7 @@ import java.util.*; -public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperties, ComplexType { +public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperties { /** * The value of the 'type' attribute in the OpenAPI schema. * The per-language codegen logic may change to a language-specific type. @@ -206,11 +206,6 @@ public String getComplexType() { return complexType; } - @Override - public boolean isContainer() { - return isContainer; - } - public void setComplexType(String complexType) { this.complexType = complexType; } @@ -631,11 +626,6 @@ public CodegenComposedSchemas getComposedSchemas() { return composedSchemas; } - @Override - public ComplexType getInner() { - return items; - } - @Override public CodegenProperty clone() { try { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java index 7a23b3ab7267..33fcf0afa520 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java @@ -614,4 +614,9 @@ public CodegenComposedSchemas getComposedSchemas() { @Override public void setHasMultipleTypes(boolean hasMultipleTypes) { this.hasMultipleTypes = hasMultipleTypes; } + + @Override + public String getBaseType() { + return baseType; + } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java deleted file mode 100644 index d12749f4f85b..000000000000 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ComplexType.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.openapitools.codegen; - -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Stream; - -public interface ComplexType { - - /** - * @return basic type - no generics supported. - */ - String getBaseType(); - - /** - * @return complex type that can contain type parameters - like {@code List} for Java - */ - String getComplexType(); - - /** - * @return true if set, map or list. - */ - boolean isContainer(); - - /** - * @return the composed schemas that might make up this type, null otherwise. - */ - CodegenComposedSchemas getComposedSchemas(); - - /** - * @return the inner type in the case of a type with type parameters - */ - ComplexType getInner(); - - /** - * Recursively collect all necessary imports to include so that the type may be resolved. - * - * @param includeContainerTypes whether or not to include the container types in the returned imports. - * @return all of the imports - */ - default Set getImports(boolean includeContainerTypes) { - Set imports = new HashSet<>(); - if (includeContainerTypes || !this.isContainer()) { - if (this.getComposedSchemas() != null) { - CodegenComposedSchemas composed = (CodegenComposedSchemas) this.getComposedSchemas(); - List allOfs = composed.getAllOf() == null ? Collections.emptyList() : composed.getAllOf(); - List oneOfs = composed.getOneOf() == null ? Collections.emptyList() : composed.getOneOf(); - Stream innerTypes = Stream.concat(allOfs.stream(), oneOfs.stream()); - innerTypes.flatMap(cp -> cp.getImports(includeContainerTypes).stream()).forEach(s -> imports.add(s)); - } else { - imports.add(this.getComplexType()); - imports.add(this.getBaseType()); - } - } - if (this.getInner() !=null) { - imports.addAll(this.getInner().getImports(includeContainerTypes)); - } - return imports; - } -} 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 36ee2966d28f..3cfdfab06f61 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 @@ -5120,11 +5120,11 @@ private static String generateNextName(String name) { } } - protected void addImports(CodegenModel m, ComplexType type) { + protected void addImports(CodegenModel m, IJsonSchemaValidationProperties type) { addImports(m.imports, type); } - protected void addImports(Set importsToBeAddedTo, ComplexType type) { + protected void addImports(Set importsToBeAddedTo, IJsonSchemaValidationProperties type) { addImports(importsToBeAddedTo, type.getImports(true)); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java index eb95821d6f3c..add0df8cc6ca 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java @@ -1,6 +1,10 @@ package org.openapitools.codegen; +import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import java.util.stream.Stream; import io.swagger.v3.oas.models.media.Schema; import org.openapitools.codegen.utils.ModelUtils; @@ -213,4 +217,44 @@ default void setTypeProperties(Schema p) { setIsAnyType(true); } } + + /** + * @return basic type - no generics supported. + */ + default String getBaseType() { + return null; + }; + + /** + * @return complex type that can contain type parameters - like {@code List} for Java + */ + default String getComplexType() { + return getBaseType(); + }; + + /** + * Recursively collect all necessary imports to include so that the type may be resolved. + * + * @param includeContainerTypes whether or not to include the container types in the returned imports. + * @return all of the imports + */ + default Set getImports(boolean includeContainerTypes) { + Set imports = new HashSet<>(); + if (includeContainerTypes || !(this.getIsArray() || this.getIsMap())) { + if (this.getComposedSchemas() != null) { + CodegenComposedSchemas composed = (CodegenComposedSchemas) this.getComposedSchemas(); + List allOfs = composed.getAllOf() == null ? Collections.emptyList() : composed.getAllOf(); + List oneOfs = composed.getOneOf() == null ? Collections.emptyList() : composed.getOneOf(); + Stream innerTypes = Stream.concat(allOfs.stream(), oneOfs.stream()); + innerTypes.flatMap(cp -> cp.getImports(includeContainerTypes).stream()).forEach(s -> imports.add(s)); + } else { + imports.add(this.getComplexType()); + imports.add(this.getBaseType()); + } + } + if (this.getItems() !=null) { + imports.addAll(this.getItems().getImports(includeContainerTypes)); + } + return imports; + } } \ No newline at end of file From 5dd54d020019244d5db5bd1a2e4e1ad5edef7d54 Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Thu, 13 Jan 2022 12:46:01 -0500 Subject: [PATCH 11/14] Include additionalProperties recursion. --- .../openapitools/codegen/IJsonSchemaValidationProperties.java | 3 +++ .../model/mixed_properties_and_additional_properties_class.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java index add0df8cc6ca..f679fb7c859c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java @@ -255,6 +255,9 @@ default Set getImports(boolean includeContainerTypes) { if (this.getItems() !=null) { imports.addAll(this.getItems().getImports(includeContainerTypes)); } + if (this.getAdditionalProperties() != null) { + imports.addAll(this.getAdditionalProperties().getImports(includeContainerTypes)); + } return imports; } } \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py index e3a39533757c..e04cc1c0cc4b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py @@ -119,3 +119,5 @@ def __new__( _instantiation_metadata=_instantiation_metadata, **kwargs, ) + +from petstore_api.model.animal import Animal From 0181fdd77e7a7934602e1cabfeea1b84e96d6649 Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Thu, 13 Jan 2022 16:40:20 -0500 Subject: [PATCH 12/14] More feedback --- .../IJsonSchemaValidationProperties.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java index f679fb7c859c..76f249520d7e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java @@ -240,19 +240,18 @@ default String getComplexType() { */ default Set getImports(boolean includeContainerTypes) { Set imports = new HashSet<>(); - if (includeContainerTypes || !(this.getIsArray() || this.getIsMap())) { - if (this.getComposedSchemas() != null) { - CodegenComposedSchemas composed = (CodegenComposedSchemas) this.getComposedSchemas(); - List allOfs = composed.getAllOf() == null ? Collections.emptyList() : composed.getAllOf(); - List oneOfs = composed.getOneOf() == null ? Collections.emptyList() : composed.getOneOf(); - Stream innerTypes = Stream.concat(allOfs.stream(), oneOfs.stream()); - innerTypes.flatMap(cp -> cp.getImports(includeContainerTypes).stream()).forEach(s -> imports.add(s)); - } else { - imports.add(this.getComplexType()); - imports.add(this.getBaseType()); - } + if (this.getComposedSchemas() != null) { + CodegenComposedSchemas composed = (CodegenComposedSchemas) this.getComposedSchemas(); + List allOfs = composed.getAllOf() == null ? Collections.emptyList() : composed.getAllOf(); + List oneOfs = composed.getOneOf() == null ? Collections.emptyList() : composed.getOneOf(); + Stream innerTypes = Stream.concat(allOfs.stream(), oneOfs.stream()); + innerTypes.flatMap(cp -> cp.getImports(includeContainerTypes).stream()).forEach(s -> imports.add(s)); + } else if (includeContainerTypes || !(this.getIsArray() || this.getIsMap())) { + // Composed types shouldn't be added directly because types like `Cat | Dog` won't have resolvable imports. + imports.add(this.getComplexType()); + imports.add(this.getBaseType()); } - if (this.getItems() !=null) { + if (this.getItems() !=null && this.getIsArray()) { imports.addAll(this.getItems().getImports(includeContainerTypes)); } if (this.getAdditionalProperties() != null) { From 0a9d5b920d35a003c80bef45c4da0efa29ed1b07 Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Thu, 13 Jan 2022 18:24:05 -0500 Subject: [PATCH 13/14] More feedback --- .../openapitools/codegen/IJsonSchemaValidationProperties.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java index 76f249520d7e..88f883f986cf 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java @@ -257,6 +257,9 @@ default Set getImports(boolean includeContainerTypes) { if (this.getAdditionalProperties() != null) { imports.addAll(this.getAdditionalProperties().getImports(includeContainerTypes)); } + if (this.getVars() != null && !this.getVars().isEmpty()) { + this.getVars().stream().flatMap(v -> v.getImports(includeContainerTypes).stream()).forEach(s -> imports.add(s)); + } return imports; } } \ No newline at end of file From 404e5b41e1438b18746a3fe25cbeeb8bbc214290 Mon Sep 17 00:00:00 2001 From: ethan92429 Date: Fri, 14 Jan 2022 12:49:05 -0500 Subject: [PATCH 14/14] Add comments from feedback --- .../openapitools/codegen/IJsonSchemaValidationProperties.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java index 88f883f986cf..187e3f5a14a1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java @@ -247,7 +247,9 @@ default Set getImports(boolean includeContainerTypes) { Stream innerTypes = Stream.concat(allOfs.stream(), oneOfs.stream()); innerTypes.flatMap(cp -> cp.getImports(includeContainerTypes).stream()).forEach(s -> imports.add(s)); } else if (includeContainerTypes || !(this.getIsArray() || this.getIsMap())) { - // Composed types shouldn't be added directly because types like `Cat | Dog` won't have resolvable imports. + // this is our base case, add imports for referenced schemas + // this can't be broken out as a separate if block because Typescript only generates union types as A | B + // and would need to handle this differently imports.add(this.getComplexType()); imports.add(this.getBaseType()); }