From 54a529cfe5c420106d7298a7821346a4805353de Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Fri, 26 Jun 2020 11:17:14 +0200 Subject: [PATCH 01/33] First approach for discussion --- .../AbstractTypeScriptClientCodegen.java | 62 ++++++++++++++++ .../TypeScriptAngularClientCodegen.java | 19 +++-- .../TypeScriptAxiosClientCodegen.java | 8 +- .../TypeScriptNodeClientCodegen.java | 14 ++-- .../typescript/CommenTypeScriptTest.java | 49 ++++++++++++ .../src/test/resources/split-import.json | 74 +++++++++++++++++++ 6 files changed, 213 insertions(+), 13 deletions(-) create mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/CommenTypeScriptTest.java create mode 100644 modules/openapi-generator/src/test/resources/split-import.json diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index 4b5f43e46008..ac27f027841b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -17,6 +17,8 @@ package org.openapitools.codegen.languages; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.ComposedSchema; @@ -35,6 +37,7 @@ import java.io.File; import java.text.SimpleDateFormat; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -221,6 +224,65 @@ public void processOpts() { } } + @Override + public String toModelImport( String name){ + if(name.contains("|")){ + List names = Arrays.asList(name.split("\\|")); + return names.stream() + .map(withSpace->withSpace.replaceAll(" ","")) + .map(noSpace->super.toModelImport(noSpace)) + .collect(Collectors.joining("|")); + } + return super.toModelImport(name); + } + + protected String toModelImportForUnionTypes(String name, Function toModelImportSingle){ + if(name.contains("|")){ + List names = Arrays.asList(name.split("\\|")); + return names.stream() + .map(withSpace->withSpace.replaceAll(" ","")) + .map(noSpace->toModelImportSingle.apply(noSpace)) + .collect(Collectors.joining("|")); + } + return toModelImportSingle.apply(name); + } + + @Override + public Map postProcessOperationsWithModels(final Map objs, final List allModels) { + Map objsUnderProcess= super.postProcessOperationsWithModels(objs, allModels); + + if(Boolean.valueOf(objsUnderProcess.get("hasImport").toString())){ + objsUnderProcess.put("imports", splitUniontypeImports((List>) objsUnderProcess.get("imports"))); + } + return objsUnderProcess; + } + + protected List splitUniontypeImports(List> imports){ + List splittedImports = Lists.newArrayList(); + imports.forEach( + (importEntry)->{ + if(importEntry.get("import").contains("|")){ + String[] importsForEntry = importEntry.get("import").split("\\|"); + String[] classNamesForEntry = importEntry.get("classname").replaceAll(" ","").split("\\|"); + if(importsForEntry.length != classNamesForEntry.length){ + throw new RuntimeException(String.format("Size of imports and class names do not match. Imports: %s ClassNames: %s",importsForEntry.toString(),classNamesForEntry.toString())); + } + for(int i=0; i < importsForEntry.length;i++){ + Map splittedImportEntry= Maps.newHashMap(); + splittedImportEntry.put("import",importsForEntry[i]); + splittedImportEntry.put("classname",classNamesForEntry[i]); + if(!imports.contains(splittedImportEntry)) { + splittedImports.add(splittedImportEntry); + } + } + }else { + splittedImports.add(importEntry); + } + } + ); + return splittedImports; + } + @Override public void preprocessOpenAPI(OpenAPI openAPI) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index b9632aee1947..7d3c19eaddee 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -27,6 +27,7 @@ import java.io.File; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -176,7 +177,7 @@ public void processOpts() { apiTemplateFiles.put("apiInterface.mustache", "Interface.ts"); } } - + if (additionalProperties.containsKey(USE_SINGLE_REQUEST_PARAMETER)) { this.setUseSingleRequestParameter(convertPropertyToBoolean(USE_SINGLE_REQUEST_PARAMETER)); } @@ -194,7 +195,7 @@ public void processOpts() { )); } - if (ngVersion.atLeast("9.0.0")) { + if (ngVersion.atLeast("9.0.0")) { additionalProperties.put(ENFORCE_GENERIC_MODULE_WITH_PROVIDERS, true); } else { additionalProperties.put(ENFORCE_GENERIC_MODULE_WITH_PROVIDERS, false); @@ -333,7 +334,7 @@ public boolean getQueryParamObjectFormatKey() { public boolean isDataTypeFile(final String dataType) { return dataType != null && dataType.equals("Blob"); } - + @Override public String getTypeDeclaration(Schema p) { if (ModelUtils.isFileSchema(p)) { @@ -359,6 +360,7 @@ public void postProcessParameter(CodegenParameter parameter) { @Override public Map postProcessOperationsWithModels(Map operations, List allModels) { + operations = super.postProcessOperationsWithModels(operations, allModels); Map objs = (Map) operations.get("operations"); // Add filename information for api imports @@ -546,10 +548,13 @@ public String toModelFilename(String name) { @Override public String toModelImport(String name) { - if (importMapping.containsKey(name)) { - return importMapping.get(name); - } - return modelPackage() + "/" + toModelFilename(name).substring(DEFAULT_IMPORT_PREFIX.length()); + Function toModelImportAngular = (s) -> { + if (importMapping.containsKey(s)) { + return importMapping.get(s); + } + return modelPackage() + "/" + toModelFilename(s).substring(DEFAULT_IMPORT_PREFIX.length()); + }; + return toModelImportForUnionTypes(name,toModelImportAngular); } public String getNpmRepository() { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java index 95ded86dce5e..d2164d215c5a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java @@ -17,6 +17,8 @@ package org.openapitools.codegen.languages; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.parser.util.SchemaTypeUtil; import org.apache.commons.lang3.StringUtils; @@ -26,7 +28,6 @@ import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.SupportingFile; import org.openapitools.codegen.meta.features.DocumentationFeature; -import org.openapitools.codegen.utils.ModelUtils; import java.util.*; @@ -148,6 +149,11 @@ public Map postProcessOperationsWithModels(Map o return objs; } + @Override + public String toModelImport(final String name) { + return toModelImportForUnionTypes(name,super::toModelImport); + } + @Override public Map postProcessAllModels(Map objs) { Map result = super.postProcessAllModels(objs); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java index 09d5ae4df4e8..85c50e8ce679 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java @@ -29,6 +29,7 @@ import java.io.File; import java.util.*; +import java.util.function.Function; import static org.openapitools.codegen.utils.StringUtils.camelize; @@ -158,11 +159,13 @@ public String toModelFilename(String name) { @Override public String toModelImport(String name) { - if (importMapping.containsKey(name)) { - return importMapping.get(name); - } - - return modelPackage() + "/" + camelize(toModelName(name), true); + Function toModelImportNode = s -> { + if (importMapping.containsKey(s)) { + return importMapping.get(s); + } + return modelPackage() + "/" + camelize(toModelName(s), true); + }; + return toModelImportForUnionTypes(name,toModelImportNode); } @Override @@ -197,6 +200,7 @@ private List> toTsImports(CodegenModel cm, Set impor @Override public Map postProcessOperationsWithModels(Map operations, List allModels) { + operations = super.postProcessOperationsWithModels(operations, allModels); Map objs = (Map) operations.get("operations"); // The api.mustache template requires all of the auth methods for the whole api diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/CommenTypeScriptTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/CommenTypeScriptTest.java new file mode 100644 index 000000000000..f99b4376d0fb --- /dev/null +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/CommenTypeScriptTest.java @@ -0,0 +1,49 @@ +package org.openapitools.codegen.typescript; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; +import org.openapitools.codegen.DefaultGenerator; +import org.openapitools.codegen.Generator; +import org.openapitools.codegen.config.CodegenConfigurator; +import org.openapitools.codegen.languages.TypeScriptAxiosClientCodegen; +import org.testng.Assert; +import org.testng.annotations.Test; + +import java.io.File; +import java.io.IOException; +import java.util.List; + +public class CommenTypeScriptTest { + @Test + public void splitImport() throws IOException { + CodegenConfigurator config = + new CodegenConfigurator() + .setInputSpec("split-import.json") + .setModelPackage("model") + .setApiPackage("api") + .addAdditionalProperty( + TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); + + config.setGeneratorName("typescript-axios"); + checkAPIFile(getGenerator(config).generate(), "default-api.ts"); + + config.setGeneratorName("typescript-node"); + checkAPIFile(getGenerator(config).generate(), "defaultApi.ts"); + + config.setGeneratorName("typescript-angular"); + checkAPIFile(getGenerator(config).generate(), "default.service.ts"); + + } + + private Generator getGenerator(CodegenConfigurator config) { + return new DefaultGenerator().opts(config.toClientOptInput()); + } + + private void checkAPIFile(List files, String apiFileName) throws IOException { + File apiFile = files.stream().filter(file->file.getName().contains(apiFileName)).findFirst().get(); + String apiFileContent = FileUtils.readFileToString(apiFile); + Assert.assertTrue(!apiFileContent.contains("import { OrganizationWrapper | PersonWrapper }")); + Assert.assertEquals(StringUtils.countMatches(apiFileContent,"import { PersonWrapper }"),1); + Assert.assertEquals(StringUtils.countMatches(apiFileContent,"import { OrganizationWrapper }"),1); + } +} diff --git a/modules/openapi-generator/src/test/resources/split-import.json b/modules/openapi-generator/src/test/resources/split-import.json new file mode 100644 index 000000000000..736517af4635 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/split-import.json @@ -0,0 +1,74 @@ +{ + "openapi": "3.0.2", + "info": { + "title": "SAP Graph - Customers API", + "version": "0.1.0" + }, + "paths": { + "/Customer": { + "get": { + "operationId": "getCustomer", + "responses": { + "200": { + "$ref": "#/components/responses/CustomerResponse" + } + } + } + }, + "/Person": { + "get": { + "operationId": "getPerson", + "responses": { + "200": { + "$ref": "#/components/responses/PersonResponse" + } + } + } + } + }, + "components": { + "schemas": { + "OrganizationWrapper": { + "type": "object", + "properties": { + "id": {"type": "string"} + } + }, + "PersonWrapper": { + "type": "object", + "properties": { + "id": {"type": "string"} + } + } + }, + "responses": { + "CustomerResponse": { + "description": "Get Customer", + "content": { + "application/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/OrganizationWrapper" + }, + { + "$ref": "#/components/schemas/PersonWrapper" + } + ] + } + } + } + }, + "PersonResponse": { + "description": "Get Person", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PersonWrapper" + } + } + } + } + } + } +} From 234d2bd1c337bc19d893b7f15b10692474f57448 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Fri, 26 Jun 2020 11:17:47 +0200 Subject: [PATCH 02/33] typo --- .../{CommenTypeScriptTest.java => SharedTypeScriptTest.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/{CommenTypeScriptTest.java => SharedTypeScriptTest.java} (98%) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/CommenTypeScriptTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java similarity index 98% rename from modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/CommenTypeScriptTest.java rename to modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java index f99b4376d0fb..75642244c053 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/CommenTypeScriptTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java @@ -13,7 +13,7 @@ import java.io.IOException; import java.util.List; -public class CommenTypeScriptTest { +public class SharedTypeScriptTest { @Test public void splitImport() throws IOException { CodegenConfigurator config = From 74f32861f2bc48a7f6ffa801e6f48e1dae2273b6 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Wed, 1 Jul 2020 14:55:44 +0200 Subject: [PATCH 03/33] add addiotional method --- .../openapitools/codegen/CodegenConfig.java | 2 + .../openapitools/codegen/DefaultCodegen.java | 11 ++++ .../codegen/DefaultGenerator.java | 48 ++++++++------ .../AbstractTypeScriptClientCodegen.java | 57 ++++------------- .../TypeScriptAngularClientCodegen.java | 62 ++++++++++++------- .../TypeScriptAxiosClientCodegen.java | 6 -- .../TypeScriptNodeClientCodegen.java | 12 ++-- 7 files changed, 97 insertions(+), 101 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java index 26b91464f898..3f52424b6170 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java @@ -174,6 +174,8 @@ public interface CodegenConfig { String toModelImport(String name); + Map toModelImportMap(String name); + String toApiImport(String name); void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map> operations); 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 c012510f3673..158dbc7775f5 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 @@ -22,6 +22,7 @@ import com.github.benmanes.caffeine.cache.Ticker; import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Mustache.Compiler; import com.samskivert.mustache.Mustache.Lambda; @@ -1367,6 +1368,16 @@ public String toModelImport(String name) { } } + /** + * Returns the same content as [[toModelImport]] with key the fully-qualified Model name and value the initial input. + * In case of union types this method has a key for each separate model and import. + * @param name the name of the "Model" + * @return Map of fully-qualified models. + */ + public Map toModelImportMap(String name){ + return Collections.singletonMap(this.toModelImport(name),name); + } + /** * Return the fully-qualified "Api" name for import * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 47d3540b1112..839352bfd1c4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -17,6 +17,8 @@ package org.openapitools.codegen; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import io.swagger.v3.core.util.Json; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; @@ -1077,24 +1079,8 @@ private Map processOperations(CodegenConfig config, String tag, allImports.addAll(op.imports); } - List> imports = new ArrayList<>(); - Set mappingSet = new TreeSet<>(); - for (String nextImport : allImports) { - Map im = new LinkedHashMap<>(); - String mapping = config.importMapping().get(nextImport); - if (mapping == null) { - mapping = config.toModelImport(nextImport); - } - - if (mapping != null && !mappingSet.contains(mapping)) { // ensure import (mapping) is unique - mappingSet.add(mapping); - im.put("import", mapping); - im.put("classname", nextImport); - if (!imports.contains(im)) { // avoid duplicates - imports.add(im); - } - } - } + Map mappings = getAllImportsMapppings(allImports); + List> imports = toImportsObjects(mappings); operations.put("imports", imports); @@ -1115,6 +1101,32 @@ private Map processOperations(CodegenConfig config, String tag, return operations; } + private Map getAllImportsMapppings(Set allImports){ + Map result = Maps.newHashMap(); + allImports.forEach(nextImport->{ + String mapping = config.importMapping().get(nextImport); + if(mapping!= null){ + result.put(mapping,nextImport); + }else{ + result.putAll(config.toModelImportMap(nextImport)); + } + }); + return result; + } + + private List> toImportsObjects(Map mappedImports){ + List> result = Lists.newArrayList(); + mappedImports.entrySet().forEach(mapping->{ + Map im = new LinkedHashMap<>(); + im.put("import", mapping.getKey()); + im.put("classname", mapping.getValue()); + if (!result.contains(im)) { // avoid duplicates + result.add(im); + } + }); + return result; + } + private Map processModels(CodegenConfig config, Map definitions) { Map objs = new HashMap<>(); objs.put("package", config.modelPackage()); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index ac27f027841b..a85fb31656a6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -227,7 +227,8 @@ public void processOpts() { @Override public String toModelImport( String name){ if(name.contains("|")){ - List names = Arrays.asList(name.split("\\|")); + List names = Arrays.asList(name.split("\\|")); + LOGGER.warn("The import is a union type. Consider using the toModelImportMap method."); return names.stream() .map(withSpace->withSpace.replaceAll(" ","")) .map(noSpace->super.toModelImport(noSpace)) @@ -236,53 +237,19 @@ public String toModelImport( String name){ return super.toModelImport(name); } - protected String toModelImportForUnionTypes(String name, Function toModelImportSingle){ + + @Override + public Map toModelImportMap( String name){ if(name.contains("|")){ - List names = Arrays.asList(name.split("\\|")); - return names.stream() - .map(withSpace->withSpace.replaceAll(" ","")) - .map(noSpace->toModelImportSingle.apply(noSpace)) - .collect(Collectors.joining("|")); - } - return toModelImportSingle.apply(name); - } - - @Override - public Map postProcessOperationsWithModels(final Map objs, final List allModels) { - Map objsUnderProcess= super.postProcessOperationsWithModels(objs, allModels); - - if(Boolean.valueOf(objsUnderProcess.get("hasImport").toString())){ - objsUnderProcess.put("imports", splitUniontypeImports((List>) objsUnderProcess.get("imports"))); - } - return objsUnderProcess; - } - - protected List splitUniontypeImports(List> imports){ - List splittedImports = Lists.newArrayList(); - imports.forEach( - (importEntry)->{ - if(importEntry.get("import").contains("|")){ - String[] importsForEntry = importEntry.get("import").split("\\|"); - String[] classNamesForEntry = importEntry.get("classname").replaceAll(" ","").split("\\|"); - if(importsForEntry.length != classNamesForEntry.length){ - throw new RuntimeException(String.format("Size of imports and class names do not match. Imports: %s ClassNames: %s",importsForEntry.toString(),classNamesForEntry.toString())); - } - for(int i=0; i < importsForEntry.length;i++){ - Map splittedImportEntry= Maps.newHashMap(); - splittedImportEntry.put("import",importsForEntry[i]); - splittedImportEntry.put("classname",classNamesForEntry[i]); - if(!imports.contains(splittedImportEntry)) { - splittedImports.add(splittedImportEntry); - } - } - }else { - splittedImports.add(importEntry); - } - } - ); - return splittedImports; + List names = Arrays.asList(name.replace(" ","").split("\\|")); + Map result = Maps.newHashMap(); + names.forEach(s->result.put(toModelImport(s),s)); + return result; + } + return Collections.singletonMap(toModelImport(name),name); } + @Override public void preprocessOpenAPI(OpenAPI openAPI) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index 7d3c19eaddee..0416e00afc60 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -17,6 +17,8 @@ package org.openapitools.codegen.languages; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import io.swagger.v3.oas.models.media.Schema; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.DocumentationFeature; @@ -363,6 +365,10 @@ public Map postProcessOperationsWithModels(Map o operations = super.postProcessOperationsWithModels(operations, allModels); Map objs = (Map) operations.get("operations"); + // Add additional filename information for imports + Map parsedImports = parseImports((List>) operations.get("imports")); +// mo.put("tsImports", toTsImports(cm, parsedImports)); + // Add filename information for api imports objs.put("apiFilename", getApiFilenameFromClassname(objs.get("classname").toString())); @@ -472,9 +478,6 @@ public Map postProcessAllModels(Map objs) { cm.imports.remove(cm.parent); } } - // Add additional filename information for imports - Set parsedImports = parseImports(cm); - mo.put("tsImports", toTsImports(cm, parsedImports)); } } return result; @@ -483,23 +486,36 @@ public Map postProcessAllModels(Map objs) { /** * Parse imports */ - private Set parseImports(CodegenModel cm) { - Set newImports = new HashSet(); - if (cm.imports.size() > 0) { - for (String name : cm.imports) { - if (name.indexOf(" | ") >= 0) { - String[] parts = name.split(" \\| "); - for (String s : parts) { - newImports.add(s); - } - } else { - newImports.add(name); - } - } - } + private Map parseImports(List> imports) { + Map newImports = Maps.newHashMap(); + imports.forEach( + (importEntry)-> { + String importValue = importEntry.get("import"); + String classnameValue = importEntry.get("classname"); + if (importValue.contains("|")) { + Set importSplitted = removeSpacesAndSplit(importValue); + Set classSplitted = removeSpacesAndSplit(classnameValue); + classnameValue = classnameValue.replace(" ", ""); +// newImports.addAll(Arrays.asList(importValue.split("\\|"))); + importValue.split("|"); + } else { + newImports.put(importValue,classnameValue); + } + }); return newImports; } + private Set removeSpacesAndSplit(String input){ + return Arrays.stream(input.replaceAll(" ", "").split("\\|")).collect(Collectors.toSet()); + } + +// private Map toMap(Set imports,Set classes){ +// Map newImports = Maps.newHashMap(); +// imports.forEach(i->{ +//// classes.stream().filter(f->i.co) +// }); +// } + private List> toTsImports(CodegenModel cm, Set imports) { List> tsImports = new ArrayList<>(); for (String im : imports) { @@ -548,15 +564,13 @@ public String toModelFilename(String name) { @Override public String toModelImport(String name) { - Function toModelImportAngular = (s) -> { - if (importMapping.containsKey(s)) { - return importMapping.get(s); - } - return modelPackage() + "/" + toModelFilename(s).substring(DEFAULT_IMPORT_PREFIX.length()); - }; - return toModelImportForUnionTypes(name,toModelImportAngular); + if (importMapping.containsKey(name)) { + return importMapping.get(name); + } + return modelPackage() + "/" + toModelFilename(name).substring(DEFAULT_IMPORT_PREFIX.length()); } + public String getNpmRepository() { return npmRepository; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java index d2164d215c5a..aa70a5bfd9db 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java @@ -135,7 +135,6 @@ public void processOpts() { @Override public Map postProcessOperationsWithModels(Map objs, List allModels) { - objs = super.postProcessOperationsWithModels(objs, allModels); Map vals = (Map) objs.getOrDefault("operations", new HashMap<>()); List operations = (List) vals.getOrDefault("operation", new ArrayList<>()); /* @@ -149,11 +148,6 @@ public Map postProcessOperationsWithModels(Map o return objs; } - @Override - public String toModelImport(final String name) { - return toModelImportForUnionTypes(name,super::toModelImport); - } - @Override public Map postProcessAllModels(Map objs) { Map result = super.postProcessAllModels(objs); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java index 85c50e8ce679..d870da747bea 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java @@ -159,13 +159,10 @@ public String toModelFilename(String name) { @Override public String toModelImport(String name) { - Function toModelImportNode = s -> { - if (importMapping.containsKey(s)) { - return importMapping.get(s); - } - return modelPackage() + "/" + camelize(toModelName(s), true); - }; - return toModelImportForUnionTypes(name,toModelImportNode); + if (importMapping.containsKey(name)) { + return importMapping.get(name); + } + return modelPackage() + "/" + camelize(toModelName(name), true); } @Override @@ -200,7 +197,6 @@ private List> toTsImports(CodegenModel cm, Set impor @Override public Map postProcessOperationsWithModels(Map operations, List allModels) { - operations = super.postProcessOperationsWithModels(operations, allModels); Map objs = (Map) operations.get("operations"); // The api.mustache template requires all of the auth methods for the whole api From 598ec7b24e24bd0d524925a9a0533ccf52562b16 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Wed, 1 Jul 2020 15:03:45 +0200 Subject: [PATCH 04/33] polish a bit --- .../AbstractTypeScriptClientCodegen.java | 9 +++- .../TypeScriptAngularClientCodegen.java | 54 ------------------- .../TypeScriptAxiosClientCodegen.java | 2 - .../TypeScriptNodeClientCodegen.java | 1 - 4 files changed, 8 insertions(+), 58 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index a85fb31656a6..6eee4172a302 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -237,7 +237,14 @@ public String toModelImport( String name){ return super.toModelImport(name); } - + /** + * Maps the fully qualified model import to the initial given name. In case of union types the map will have multiple entries. + * For example for "classA | classB" the map will two entries have "model.classA"->"classA" and "model.classB"->"classB". + * + * + * @param name the name of the "Model" + * @return Map between the fully qualified model import and the initial given name. + */ @Override public Map toModelImportMap( String name){ if(name.contains("|")){ diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index 0416e00afc60..6e4eef552205 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -17,8 +17,6 @@ package org.openapitools.codegen.languages; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import io.swagger.v3.oas.models.media.Schema; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.DocumentationFeature; @@ -29,7 +27,6 @@ import java.io.File; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -365,10 +362,6 @@ public Map postProcessOperationsWithModels(Map o operations = super.postProcessOperationsWithModels(operations, allModels); Map objs = (Map) operations.get("operations"); - // Add additional filename information for imports - Map parsedImports = parseImports((List>) operations.get("imports")); -// mo.put("tsImports", toTsImports(cm, parsedImports)); - // Add filename information for api imports objs.put("apiFilename", getApiFilenameFromClassname(objs.get("classname").toString())); @@ -483,53 +476,6 @@ public Map postProcessAllModels(Map objs) { return result; } - /** - * Parse imports - */ - private Map parseImports(List> imports) { - Map newImports = Maps.newHashMap(); - imports.forEach( - (importEntry)-> { - String importValue = importEntry.get("import"); - String classnameValue = importEntry.get("classname"); - if (importValue.contains("|")) { - Set importSplitted = removeSpacesAndSplit(importValue); - Set classSplitted = removeSpacesAndSplit(classnameValue); - classnameValue = classnameValue.replace(" ", ""); -// newImports.addAll(Arrays.asList(importValue.split("\\|"))); - importValue.split("|"); - } else { - newImports.put(importValue,classnameValue); - } - }); - return newImports; - } - - private Set removeSpacesAndSplit(String input){ - return Arrays.stream(input.replaceAll(" ", "").split("\\|")).collect(Collectors.toSet()); - } - -// private Map toMap(Set imports,Set classes){ -// Map newImports = Maps.newHashMap(); -// imports.forEach(i->{ -//// classes.stream().filter(f->i.co) -// }); -// } - - private List> toTsImports(CodegenModel cm, Set imports) { - List> tsImports = new ArrayList<>(); - for (String im : imports) { - if (!im.equals(cm.classname)) { - HashMap tsImport = new HashMap<>(); - // TVG: This is used as class name in the import statements of the model file - tsImport.put("classname", im); - tsImport.put("filename", toModelFilename(removeModelPrefixSuffix(im))); - tsImports.add(tsImport); - } - } - return tsImports; - } - @Override public String toApiName(String name) { if (name.length() == 0) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java index aa70a5bfd9db..09bc5d441dc0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java @@ -17,8 +17,6 @@ package org.openapitools.codegen.languages; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.parser.util.SchemaTypeUtil; import org.apache.commons.lang3.StringUtils; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java index d870da747bea..d2b613e5aaf7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java @@ -29,7 +29,6 @@ import java.io.File; import java.util.*; -import java.util.function.Function; import static org.openapitools.codegen.utils.StringUtils.camelize; From 57e9f2ea13d42419686b115bfada8fd057859639 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Wed, 1 Jul 2020 15:10:19 +0200 Subject: [PATCH 05/33] remove call of super method --- .../codegen/languages/TypeScriptAngularClientCodegen.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index 6e4eef552205..6407c815c19c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -359,7 +359,6 @@ public void postProcessParameter(CodegenParameter parameter) { @Override public Map postProcessOperationsWithModels(Map operations, List allModels) { - operations = super.postProcessOperationsWithModels(operations, allModels); Map objs = (Map) operations.get("operations"); // Add filename information for api imports @@ -516,7 +515,6 @@ public String toModelImport(String name) { return modelPackage() + "/" + toModelFilename(name).substring(DEFAULT_IMPORT_PREFIX.length()); } - public String getNpmRepository() { return npmRepository; } From a5f5021d32ec66931b98f90e80e8f460933c102c Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Wed, 1 Jul 2020 15:30:15 +0200 Subject: [PATCH 06/33] fix javadoc error --- .../codegen/languages/AbstractTypeScriptClientCodegen.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index 6eee4172a302..d57bef7e2803 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -239,8 +239,7 @@ public String toModelImport( String name){ /** * Maps the fully qualified model import to the initial given name. In case of union types the map will have multiple entries. - * For example for "classA | classB" the map will two entries have "model.classA"->"classA" and "model.classB"->"classB". - * + * For example for "classA | classB" the map will two entries have ["model.classA","classA"] and ["model.classB","classB"]. * * @param name the name of the "Model" * @return Map between the fully qualified model import and the initial given name. From 53d6b3c03b5e1042caa6cb9ee6f0cfabdcba5654 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Fri, 3 Jul 2020 09:08:36 +0200 Subject: [PATCH 07/33] com.google.common.collect. --- .../java/org/openapitools/codegen/DefaultGenerator.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 839352bfd1c4..d46439cc08b9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -17,8 +17,6 @@ package org.openapitools.codegen; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import io.swagger.v3.core.util.Json; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; @@ -1102,7 +1100,7 @@ private Map processOperations(CodegenConfig config, String tag, } private Map getAllImportsMapppings(Set allImports){ - Map result = Maps.newHashMap(); + Map result = Collections.emptyMap(); allImports.forEach(nextImport->{ String mapping = config.importMapping().get(nextImport); if(mapping!= null){ @@ -1115,7 +1113,7 @@ private Map getAllImportsMapppings(Set allImports){ } private List> toImportsObjects(Map mappedImports){ - List> result = Lists.newArrayList(); + List> result = Collections.emptyList(); mappedImports.entrySet().forEach(mapping->{ Map im = new LinkedHashMap<>(); im.put("import", mapping.getKey()); From cbb87013de05af27ff253361f9c1cc05fa8c99dd Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Fri, 10 Jul 2020 15:57:24 +0200 Subject: [PATCH 08/33] merge master regenerate samples --- .../org/openapitools/codegen/DefaultGenerator.java | 4 ++-- .../petstore/cpp-restsdk/client/api/PetApi.h | 4 ++-- .../petstore/cpp-restsdk/client/api/StoreApi.h | 2 +- .../petstore/cpp-restsdk/client/api/UserApi.h | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../org/openapitools/client/api/FakeApiImpl.java | 4 ++-- .../openapitools/client/api/rxjava/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../petstore/javascript-es6/src/api/FakeApi.js | 6 +++--- .../javascript-promise-es6/src/api/FakeApi.js | 6 +++--- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../client/petstore/lua/petstore/api/pet_api.lua | 2 +- .../client/petstore/nim/petstore/apis/api_pet.nim | 2 +- .../scala/org/openapitools/client/api/PetApi.scala | 2 +- .../scala/org/openapitools/client/api/PetApi.scala | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../builds/default/model/pet.ts | 2 -- .../builds/with-npm/model/pet.ts | 2 -- .../builds/default/model/pet.ts | 2 -- .../builds/with-npm/model/pet.ts | 2 -- .../builds/default/model/pet.ts | 2 -- .../builds/with-npm/model/pet.ts | 2 -- .../builds/default/model/pet.ts | 2 -- .../builds/with-npm/model/pet.ts | 2 -- .../builds/single-request-parameter/model/pet.ts | 2 -- .../builds/with-npm/model/pet.ts | 2 -- .../builds/with-prefixed-module-name/model/pet.ts | 2 -- .../api/another/level/pet-api.ts | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../server/src/handlers/OAIPetApiHandler.h | 4 ++-- .../server/src/requests/OAIPetApiRequest.h | 4 ++-- .../src/gen/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../java/org/openapitools/api/FakeApiService.java | 12 ++++++------ .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 12 ++++++------ .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../com/puppies/store/apis/PetApiController.java | 2 +- .../puppies/store/apis/PetApiControllerImp.java | 2 +- .../store/apis/PetApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/FakeApiController.java | 10 +++++----- .../app/controllers/FakeApiControllerImp.java | 10 +++++----- .../controllers/FakeApiControllerImpInterface.java | 10 +++++----- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 14 +++++++------- .../java/org/openapitools/api/FakeApiService.java | 14 +++++++------- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 14 +++++++------- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../java/org/openapitools/api/FakeApiService.java | 12 ++++++------ .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 12 ++++++------ .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 14 +++++++------- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 14 +++++++------- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/api/FakeApiService.java | 10 +++++----- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 10 +++++----- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../java/org/openapitools/api/FakeApiService.java | 12 ++++++------ .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 12 ++++++------ .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/api/FakeApiService.java | 10 +++++----- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 10 +++++----- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../java/org/openapitools/api/FakeApiService.java | 12 ++++++------ .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 12 ++++++------ .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../SymfonyBundle-php/Api/PetApiInterface.php | 2 +- .../SymfonyBundle-php/Controller/PetController.php | 2 +- .../openapi_server/controllers/pet_controller.py | 2 +- .../openapi_server/controllers/pet_controller.py | 2 +- .../openapi_server/controllers/pet_controller.py | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../org/openapitools/api/FakeApiController.java | 10 +++++----- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../org/openapitools/api/PetApiController.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiController.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../org/openapitools/api/FakeApiController.java | 10 +++++----- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../org/openapitools/api/PetApiController.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiController.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../java/org/openapitools/api/FakeApiDelegate.java | 12 ++++++------ .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/PetApiDelegate.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiDelegate.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../org/openapitools/api/FakeApiController.java | 10 +++++----- .../java/org/openapitools/api/FakeApiDelegate.java | 10 +++++----- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../org/openapitools/api/PetApiController.java | 2 +- .../java/org/openapitools/api/PetApiDelegate.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiController.java | 2 +- .../org/openapitools/api/StoreApiDelegate.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../java/org/openapitools/api/FakeApiDelegate.java | 12 ++++++------ .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/PetApiDelegate.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiDelegate.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/virtualan/api/FakeApi.java | 10 +++++----- .../org/openapitools/virtualan/api/PetApi.java | 4 ++-- .../main/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- 273 files changed, 551 insertions(+), 573 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index d46439cc08b9..4af7f7c1d408 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -1100,7 +1100,7 @@ private Map processOperations(CodegenConfig config, String tag, } private Map getAllImportsMapppings(Set allImports){ - Map result = Collections.emptyMap(); + Map result = new HashMap<>(); allImports.forEach(nextImport->{ String mapping = config.importMapping().get(nextImport); if(mapping!= null){ @@ -1113,7 +1113,7 @@ private Map getAllImportsMapppings(Set allImports){ } private List> toImportsObjects(Map mappedImports){ - List> result = Collections.emptyList(); + List> result = new ArrayList<>(); mappedImports.entrySet().forEach(mapping->{ Map im = new LinkedHashMap<>(); im.put("import", mapping.getKey()); diff --git a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h index c4956f5eec17..1e0d62e38b74 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h @@ -21,10 +21,10 @@ #include "../ApiClient.h" -#include "ApiResponse.h" -#include "HttpContent.h" #include "Pet.h" #include +#include "HttpContent.h" +#include "ApiResponse.h" #include diff --git a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h index f323827a0f8d..63fb34622df0 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h @@ -21,8 +21,8 @@ #include "../ApiClient.h" -#include "Order.h" #include +#include "Order.h" #include diff --git a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h index 04a0036b5fa8..27436bbf7745 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h @@ -21,9 +21,9 @@ #include "../ApiClient.h" -#include "User.h" #include #include +#include "User.h" #include diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java index d1d0e6ed88e5..fb5192d45e2b 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java @@ -4,13 +4,13 @@ import org.openapitools.client.EncodingUtils; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java index b954226800ac..e07c2af926e5 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java @@ -3,10 +3,10 @@ import org.openapitools.client.ApiClient; import org.openapitools.client.EncodingUtils; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java index e3e4d58cd192..dfad8d56f1c6 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java @@ -3,13 +3,13 @@ import org.openapitools.client.ApiClient; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java index 2708fb956ada..0a0ec4730c87 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import com.fasterxml.jackson.core.type.TypeReference; import com.google.api.client.http.EmptyContent; diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java index 159f6abace35..d19e7c0bbb9e 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java @@ -21,13 +21,13 @@ import org.openapitools.client.Pair; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java index a95b34eeb0ea..6bd7ecd2377b 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java @@ -20,10 +20,10 @@ import org.openapitools.client.model.*; import org.openapitools.client.Pair; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.util.ArrayList; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java index 170ca91a961f..9336de9d9333 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java @@ -9,13 +9,13 @@ import javax.ws.rs.core.GenericType; import java.math.BigDecimal; +import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java index 71fe54b109ea..5e115b7d0218 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java @@ -8,10 +8,10 @@ import javax.ws.rs.core.GenericType; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java index 33f6b0d2fe28..3c48c279ff82 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java @@ -24,9 +24,9 @@ package org.openapitools.client.api; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.io.File; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java index 8f739343f3c9..a3330651c056 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java @@ -17,13 +17,13 @@ import org.openapitools.client.Pair; import java.math.BigDecimal; +import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java index 6061337d5672..0673014831a8 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java @@ -16,10 +16,10 @@ import org.openapitools.client.ApiException; import org.openapitools.client.Pair; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java index 31b6ea1b3b29..37a30c416deb 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java @@ -18,13 +18,13 @@ import org.openapitools.client.Pair; import java.math.BigDecimal; +import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java index 78058c16ada1..481a8149d82d 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java @@ -17,10 +17,10 @@ import org.openapitools.client.ApiResponse; import org.openapitools.client.Pair; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java index 657e2dfd968b..3d39888ffe2e 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java @@ -28,13 +28,13 @@ import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.lang.reflect.Type; diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java index d8c91125157c..decfb61979b9 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java @@ -27,10 +27,10 @@ import java.io.IOException; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java index 657e2dfd968b..3d39888ffe2e 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -28,13 +28,13 @@ import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.lang.reflect.Type; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java index d8c91125157c..decfb61979b9 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java @@ -27,10 +27,10 @@ import java.io.IOException; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java index 2eaac5a4f4e0..75065e75f285 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -14,13 +14,13 @@ package org.openapitools.client.api; import java.math.BigDecimal; +import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java index fb3e63b07c93..4bd86ad6016b 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java @@ -13,10 +13,10 @@ package org.openapitools.client.api; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.Arrays; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java index 5049424b2d90..06ea289ede66 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java @@ -15,13 +15,13 @@ import com.google.gson.reflect.TypeToken; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java index 600310a6f929..8290407226fd 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java @@ -14,10 +14,10 @@ package org.openapitools.client.api; import com.google.gson.reflect.TypeToken; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.Arrays; diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java index 697b70fc85c2..4df72b06a5ed 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java @@ -8,13 +8,13 @@ import javax.ws.rs.core.GenericType; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java index 841806758c00..7139c28d6de7 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java @@ -7,10 +7,10 @@ import javax.ws.rs.core.GenericType; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java index e3fda6c1ee12..7d6f1db15326 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java @@ -3,13 +3,13 @@ import org.openapitools.client.ApiClient; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java index eac8abdc3ccd..a789c8a23fa3 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.Collections; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java index e3fda6c1ee12..7d6f1db15326 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java @@ -3,13 +3,13 @@ import org.openapitools.client.ApiClient; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java index eac8abdc3ccd..a789c8a23fa3 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.Collections; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java index a9c8e3f16da0..7c9b330658da 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java @@ -12,13 +12,13 @@ import okhttp3.MultipartBody; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java index 40e2cded8f97..58a21df55e47 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java @@ -11,10 +11,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java index dbaa2f6d1b76..b9e5b5cb752c 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -10,13 +10,13 @@ import okhttp3.MultipartBody; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java index 937389711550..56dbc56f5f43 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java @@ -9,10 +9,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java index a2d7e57449e9..898afdaec6ec 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -11,13 +11,13 @@ import okhttp3.MultipartBody; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java index bffcdb107c5d..0ae965f9cde4 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java @@ -10,10 +10,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java index 983a776a3646..a8ee355bc642 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java @@ -11,13 +11,13 @@ import okhttp3.MultipartBody; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java index 9c3cdc37f7a2..492b2626ce0e 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java @@ -10,10 +10,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java index 2a30781bdad8..d64369a228d7 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java @@ -3,10 +3,10 @@ import org.openapitools.client.ApiClient; import io.vertx.core.file.AsyncFile; import java.math.BigDecimal; +import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; import org.openapitools.client.model.XmlItem; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java index 6627a5efb3c8..db6d5f6c7459 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java @@ -2,10 +2,10 @@ import io.vertx.core.file.AsyncFile; import java.math.BigDecimal; +import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; import org.openapitools.client.model.XmlItem; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java index f3a3b9b131b2..2d091ff47764 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java @@ -2,10 +2,10 @@ import io.vertx.core.file.AsyncFile; import java.math.BigDecimal; +import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; import org.openapitools.client.model.XmlItem; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java index 95108f72e5e1..75edd95c8dcf 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java @@ -3,13 +3,13 @@ import org.openapitools.client.ApiClient; import java.math.BigDecimal; +import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; -import java.time.LocalDate; -import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.HashMap; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java index 3749fe40927c..e9301d51967b 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; +import java.io.File; import java.util.HashMap; import java.util.List; diff --git a/samples/client/petstore/javascript-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-es6/src/api/FakeApi.js index bfb8488e1bdb..ee2757ad8696 100644 --- a/samples/client/petstore/javascript-es6/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-es6/src/api/FakeApi.js @@ -13,12 +13,12 @@ import ApiClient from "../ApiClient"; +import OuterComposite from '../model/OuterComposite'; +import HealthCheckResult from '../model/HealthCheckResult'; +import User from '../model/User'; import Client from '../model/Client'; import FileSchemaTestClass from '../model/FileSchemaTestClass'; -import HealthCheckResult from '../model/HealthCheckResult'; -import OuterComposite from '../model/OuterComposite'; import Pet from '../model/Pet'; -import User from '../model/User'; /** * Fake service. diff --git a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js index 60668b32a9af..662e53e96c61 100644 --- a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js @@ -13,12 +13,12 @@ import ApiClient from "../ApiClient"; +import OuterComposite from '../model/OuterComposite'; +import HealthCheckResult from '../model/HealthCheckResult'; +import User from '../model/User'; import Client from '../model/Client'; import FileSchemaTestClass from '../model/FileSchemaTestClass'; -import HealthCheckResult from '../model/HealthCheckResult'; -import OuterComposite from '../model/OuterComposite'; import Pet from '../model/Pet'; -import User from '../model/User'; /** * Fake service. diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 60f72b51af95..0cf64291d804 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 60f72b51af95..0cf64291d804 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 584c6ef06867..e7afb5f3424e 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 1cff24913d64..d7e18365d9d0 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 60f72b51af95..0cf64291d804 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt index e164a6cf4d06..b9816034a981 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.* import io.ktor.client.request.forms.formData diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 5e930e963956..4f5d1ed15d4d 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 4b9faa2a2c46..0d8d2a061477 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 60f72b51af95..0cf64291d804 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index f3f9c057d241..3add84ff4a24 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -5,8 +5,8 @@ import retrofit2.http.* import retrofit2.Call import okhttp3.RequestBody -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse interface PetApi { /** diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index c95dd04f915e..3c740a3c6e7b 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 60f72b51af95..0cf64291d804 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 60f72b51af95..0cf64291d804 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/lua/petstore/api/pet_api.lua b/samples/client/petstore/lua/petstore/api/pet_api.lua index 02e0392c3e26..4c018ad70699 100644 --- a/samples/client/petstore/lua/petstore/api/pet_api.lua +++ b/samples/client/petstore/lua/petstore/api/pet_api.lua @@ -16,8 +16,8 @@ local dkjson = require "dkjson" local basexx = require "basexx" -- model import -local petstore_api_response = require "petstore.model.api_response" local petstore_pet = require "petstore.model.pet" +local petstore_api_response = require "petstore.model.api_response" local pet_api = {} local pet_api_mt = { diff --git a/samples/client/petstore/nim/petstore/apis/api_pet.nim b/samples/client/petstore/nim/petstore/apis/api_pet.nim index 9858c523647e..5bed84c0290e 100644 --- a/samples/client/petstore/nim/petstore/apis/api_pet.nim +++ b/samples/client/petstore/nim/petstore/apis/api_pet.nim @@ -18,8 +18,8 @@ import tables import typetraits import uri -import ../models/model_api_response import ../models/model_pet +import ../models/model_api_response const basepath = "http://petstore.swagger.io/v2" diff --git a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala index c0ba5d4c6ae2..83fd02239fef 100644 --- a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala +++ b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala @@ -11,9 +11,9 @@ */ package org.openapitools.client.api -import org.openapitools.client.model.ApiResponse import java.io.File import org.openapitools.client.model.Pet +import org.openapitools.client.model.ApiResponse import org.openapitools.client.core._ import org.openapitools.client.core.CollectionFormats._ import org.openapitools.client.core.ApiKeyLocations._ diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala index 034cceb63cc7..ba5d29519a76 100644 --- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala +++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala @@ -11,9 +11,9 @@ */ package org.openapitools.client.api -import org.openapitools.client.model.ApiResponse import java.io.File import org.openapitools.client.model.Pet +import org.openapitools.client.model.ApiResponse import org.openapitools.client.core.JsonSupport._ import sttp.client._ import sttp.model.Method diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index 2a6251140f4d..7f31865a428d 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 75e8d381d799..dc4be5d4716a 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index e47b3272c439..1aebeb1ae5b6 100644 --- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/model/pet.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/model/pet.ts index e0404395f91c..221e7b6ebdc4 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/model/pet.ts @@ -9,8 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { Category } from './category'; -import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/model/pet.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/model/pet.ts index e0404395f91c..221e7b6ebdc4 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/model/pet.ts @@ -9,8 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { Category } from './category'; -import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/model/pet.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/model/pet.ts index e0404395f91c..221e7b6ebdc4 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/model/pet.ts @@ -9,8 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { Category } from './category'; -import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/model/pet.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/model/pet.ts index e0404395f91c..221e7b6ebdc4 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/model/pet.ts @@ -9,8 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { Category } from './category'; -import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/model/pet.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/model/pet.ts index e0404395f91c..221e7b6ebdc4 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/model/pet.ts @@ -9,8 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { Category } from './category'; -import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/model/pet.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/model/pet.ts index 96bf2cd3df45..fb143205d46f 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/model/pet.ts @@ -9,8 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { Category } from './category'; -import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/model/pet.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/model/pet.ts index e0404395f91c..221e7b6ebdc4 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/model/pet.ts @@ -9,8 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { Category } from './category'; -import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/model/pet.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/model/pet.ts index e0404395f91c..221e7b6ebdc4 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/model/pet.ts @@ -9,8 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { Category } from './category'; -import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/model/pet.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/model/pet.ts index e0404395f91c..221e7b6ebdc4 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/model/pet.ts @@ -9,8 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { Category } from './category'; -import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/model/pet.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/model/pet.ts index e0404395f91c..221e7b6ebdc4 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/model/pet.ts @@ -9,8 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { Category } from './category'; -import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/model/pet.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/model/pet.ts index e0404395f91c..221e7b6ebdc4 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/model/pet.ts @@ -9,8 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { Category } from './category'; -import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts index 688c880a0feb..1c9c70d786c3 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts @@ -20,9 +20,9 @@ import { Configuration } from '../../../configuration'; // @ts-ignore import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../../../base'; // @ts-ignore -import { ApiResponse } from '../../../model/some/levels/deep'; -// @ts-ignore import { Pet } from '../../../model/some/levels/deep'; +// @ts-ignore +import { ApiResponse } from '../../../model/some/levels/deep'; /** * PetApi - axios parameter creator * @export diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java index b8893ee704f7..b0120750b5c0 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java @@ -9,15 +9,15 @@ import javax.ws.rs.core.GenericType; import java.math.BigDecimal; +import java.time.OffsetDateTime; +import java.time.LocalDate; +import org.openapitools.client.model.HealthCheckResult; import org.openapitools.client.model.Client; -import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; -import org.openapitools.client.model.HealthCheckResult; -import java.time.LocalDate; -import java.time.OffsetDateTime; -import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.OuterEnum; +import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java index 3637b9e61a5a..f92185d4296b 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java @@ -8,9 +8,9 @@ import javax.ws.rs.core.GenericType; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h index 4bc371414335..c639fac6e944 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h @@ -14,10 +14,10 @@ #include -#include "OAIApiResponse.h" -#include "OAIHttpFileElement.h" #include "OAIPet.h" +#include "OAIHttpFileElement.h" #include +#include "OAIApiResponse.h" namespace OpenAPI { diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h index 70b650ffb6ca..872ef81a6e96 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h @@ -19,10 +19,10 @@ #include #include -#include "OAIApiResponse.h" -#include "OAIHttpFileElement.h" #include "OAIPet.h" +#include "OAIHttpFileElement.h" #include +#include "OAIApiResponse.h" #include "OAIPetApiHandler.h" namespace OpenAPI { 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 1fd809f2be82..dd6457f95a08 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 @@ -8,15 +8,15 @@ import io.swagger.jaxrs.*; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; 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..5c8e94505121 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 @@ -7,15 +7,15 @@ import org.wso2.msf4j.formparam.FileInfo; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java index ea62e1388617..6a31ff87c4cd 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java index 8c72b4fb3755..365a69fffccd 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java @@ -6,10 +6,10 @@ import org.wso2.msf4j.formparam.FormDataParam; import org.wso2.msf4j.formparam.FileInfo; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java index 63dd05bf4d65..c386dd5ffdb6 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java index 0bcd337aa217..af3f9c325523 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java @@ -6,8 +6,8 @@ import org.wso2.msf4j.formparam.FormDataParam; import org.wso2.msf4j.formparam.FileInfo; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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..3e15fc5acc3d 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 @@ -4,15 +4,15 @@ import org.openapitools.model.*; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 75b9c0aa3c28..234f1f7d20be 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 7c4535b1f100..680f3d984b57 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java index de24a005c34c..8bc37f41a3a8 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java @@ -1,8 +1,8 @@ package com.puppies.store.apis; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java index 6bc56487bee4..e8a6ad87695a 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java @@ -1,8 +1,8 @@ package com.puppies.store.apis; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImpInterface.java index 39679e11f45c..90a42bb008d2 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImpInterface.java @@ -1,8 +1,8 @@ package com.puppies.store.apis; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java index 3b2126979674..1711cdc72131 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java index 679dbe248542..6afa65f9546b 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImpInterface.java index 7e4026b84cbf..78343c6b5674 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImpInterface.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java index 65c9c93ff75c..b98ca61e7c9c 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; 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 9869b1937d4b..e8f663725389 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 @@ -2,14 +2,14 @@ import java.math.BigDecimal; import apimodels.Client; -import apimodels.FileSchemaTestClass; -import java.io.InputStream; +import java.time.OffsetDateTime; +import apimodels.XmlItem; import java.time.LocalDate; import java.util.Map; -import java.time.OffsetDateTime; -import apimodels.OuterComposite; import apimodels.User; -import apimodels.XmlItem; +import apimodels.OuterComposite; +import apimodels.FileSchemaTestClass; +import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; 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 236eaf1956fc..f184b499b929 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 @@ -2,14 +2,14 @@ import java.math.BigDecimal; import apimodels.Client; -import apimodels.FileSchemaTestClass; -import java.io.InputStream; +import java.time.OffsetDateTime; +import apimodels.XmlItem; import java.time.LocalDate; import java.util.Map; -import java.time.OffsetDateTime; -import apimodels.OuterComposite; import apimodels.User; -import apimodels.XmlItem; +import apimodels.OuterComposite; +import apimodels.FileSchemaTestClass; +import java.io.InputStream; import play.mvc.Http; import java.util.List; 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 3363805d153c..a7bea418492c 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 @@ -2,14 +2,14 @@ import java.math.BigDecimal; import apimodels.Client; -import apimodels.FileSchemaTestClass; -import java.io.InputStream; +import java.time.OffsetDateTime; +import apimodels.XmlItem; import java.time.LocalDate; import java.util.Map; -import java.time.OffsetDateTime; -import apimodels.OuterComposite; import apimodels.User; -import apimodels.XmlItem; +import apimodels.OuterComposite; +import apimodels.FileSchemaTestClass; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java index 3f06e26439a0..8597930c5e50 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java @@ -1,9 +1,9 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; import java.util.Set; +import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java index 42cbef67a5f7..6b74f7452d47 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java @@ -1,9 +1,9 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; import java.util.Set; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java index 77a658334b2d..03bf9419d5e0 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java @@ -1,9 +1,9 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; import java.util.Set; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java index 9e387633d160..70c4028ce10b 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java index abd47c905137..a46d67cc612c 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImpInterface.java index 144362644aff..0367f2856f65 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImpInterface.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java index 5e02b35ec983..0395983d69d4 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java index 49b9ea1ada7a..05e2595dee10 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImpInterface.java index 6efc073d0f28..24bafa188742 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImpInterface.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java index 3ffea9428ba3..472ded89bb77 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java index 0269dfb9877a..985c152baece 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java index 633a23ba5892..218be9a9c1ab 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java index 591c99e164a2..12a1271c2953 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImpInterface.java index 307c6c18cfb9..d7e6f3e41732 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImpInterface.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java index dbfc7e755040..8883aeba8e1c 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java index 591c99e164a2..12a1271c2953 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImpInterface.java index 307c6c18cfb9..d7e6f3e41732 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImpInterface.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java index 633a23ba5892..218be9a9c1ab 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java index 591c99e164a2..12a1271c2953 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java index 307c6c18cfb9..d7e6f3e41732 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java @@ -1,8 +1,8 @@ package controllers; -import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java index c7b7d71de6e4..e42d567086fc 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java @@ -1,8 +1,8 @@ package org.openapitools.api; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java index 9e7a74b714d4..abb3cca7fa39 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java index edc0727d90c3..4b22dceb8574 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java @@ -1,8 +1,8 @@ package org.openapitools.api; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import org.openapitools.api.PetApiService; import javax.ws.rs.*; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java index a6baa2c99775..51e88462a8ef 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java @@ -6,9 +6,9 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.Multipart; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java index 0bfebfdb536e..d2b1ef792add 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import org.openapitools.api.StoreApiService; import javax.ws.rs.*; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java index 3135d74bb98e..0c215fed7382 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java @@ -6,8 +6,8 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.Multipart; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index f841e096bf51..d7a0becfec7c 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 50ea94a966cc..f1c6b21d694c 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -5,8 +5,8 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java index 8bad72910f4b..050d2f1f0c8c 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java @@ -1,8 +1,8 @@ package org.openapitools.api; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java index 0fe7ed001bc8..f2023aa2ef55 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.io.InputStream; import java.io.OutputStream; 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 ed1a63305793..a9667ca950d6 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 @@ -1,15 +1,15 @@ package org.openapitools.api; +import org.joda.time.LocalDate; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; -import org.joda.time.LocalDate; import java.util.Map; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import java.io.File; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java index 51d9b79c80d1..0a47ecc2f6c8 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java index 6cbc74824492..09280258ad31 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.io.InputStream; import java.io.OutputStream; 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 a9fa5ad0eac3..a073c10cd244 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 @@ -8,16 +8,16 @@ import io.swagger.jaxrs.*; import java.math.BigDecimal; -import org.openapitools.model.Client; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.XmlItem; +import java.time.OffsetDateTime; import java.time.LocalDate; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; 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 1d56ff1af5c8..60c132cd230b 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 @@ -6,16 +6,16 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import java.math.BigDecimal; -import org.openapitools.model.Client; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.XmlItem; +import java.time.OffsetDateTime; import java.time.LocalDate; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java index f426e3d49b9b..806e2c3deffa 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java index 1f44eee7c800..334f372eddfe 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java index eb37ae7f4e61..10b9944705df 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java index 885579d9f0f2..bb0bf81d730b 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 f5ed05e48d0c..4fc0ced7b9e7 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 @@ -4,16 +4,16 @@ import org.openapitools.model.*; import java.math.BigDecimal; -import org.openapitools.model.Client; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.XmlItem; +import java.time.OffsetDateTime; import java.time.LocalDate; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 8e3cf747147a..aae7e4cc707c 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 1e67037417eb..c9350ef90764 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 682b89705896..065c05514b53 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 @@ -8,16 +8,16 @@ import io.swagger.jaxrs.*; import java.math.BigDecimal; -import org.openapitools.model.Client; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.HealthCheckResult; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.Pet; +import java.util.Map; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; 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 2c42464c17cb..a609af9c3842 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 @@ -6,16 +6,16 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import java.math.BigDecimal; -import org.openapitools.model.Client; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.HealthCheckResult; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.Pet; +import java.util.Map; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java index 2049e604b87d..e647cd46b367 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java @@ -7,9 +7,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java index 9271117c1c77..58f687f9ac0f 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,9 +5,9 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java index 54a5de5fc1c7..6df25c0e9846 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java index db5973e5e18d..b6103464536d 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 eb5903498e58..4793964a32dc 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 @@ -4,16 +4,16 @@ import org.openapitools.model.*; import java.math.BigDecimal; -import org.openapitools.model.Client; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.HealthCheckResult; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.Pet; +import java.util.Map; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index fc29b062439b..a1a5e2d3e9ab 100644 --- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,9 +3,9 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index ea00608349fb..812afff4f939 100644 --- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java index 327b00e46c73..a97fcb32891f 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java @@ -6,9 +6,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java index 5415004bc635..dccc85aaf652 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java index a79712327381..c67a244d7dbe 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java @@ -6,8 +6,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java index ed4c8338a600..a56abf7bf5a5 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 0b264cc92ced..904864d5143d 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 4669635c2590..9553108dc08f 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java index 5b44c238acb1..3234ec661302 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java @@ -5,9 +5,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java index 8408fb1d4c97..a76b74bf330e 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 50a3d2f99c38..7aad23e3d410 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 262a0fb0005a..371e223ca7f5 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java index 5b44c238acb1..3234ec661302 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java @@ -5,9 +5,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java index 8408fb1d4c97..a76b74bf330e 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 50a3d2f99c38..7aad23e3d410 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 262a0fb0005a..371e223ca7f5 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java index 5b44c238acb1..3234ec661302 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java @@ -5,9 +5,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java index 8408fb1d4c97..a76b74bf330e 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 50a3d2f99c38..7aad23e3d410 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 262a0fb0005a..371e223ca7f5 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java index 327b00e46c73..a97fcb32891f 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java @@ -6,9 +6,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java index 5415004bc635..dccc85aaf652 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java index a79712327381..c67a244d7dbe 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java @@ -6,8 +6,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java index ed4c8338a600..a56abf7bf5a5 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 0b264cc92ced..904864d5143d 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 4669635c2590..9553108dc08f 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 5d3a13c41698..e4aaafa06e06 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 @@ -1,16 +1,16 @@ package org.openapitools.api; +import org.joda.time.LocalDate; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; -import org.joda.time.LocalDate; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java index f9db4accd552..d639612b5be6 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java index b40ba06efdef..c67a2a777e65 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import javax.ws.rs.*; import javax.ws.rs.core.Response; 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 1f3b533006c8..70fc5611978c 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 @@ -1,16 +1,16 @@ package org.openapitools.api; +import org.joda.time.LocalDate; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; -import org.joda.time.LocalDate; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java index ecd628c648ac..c15aeb1203bb 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java index c55cdddea894..93562fb4e975 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import javax.ws.rs.*; import javax.ws.rs.core.Response; 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 61ee91251643..8b85d11da16a 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 @@ -8,14 +8,14 @@ import io.swagger.jaxrs.*; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import java.io.File; import java.util.Map; import java.util.List; 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 8e38855afa7d..d2fb8f1b63f7 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 @@ -6,14 +6,14 @@ import com.sun.jersey.multipart.FormDataParam; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java index 1f3622c7a1d6..4bd2a4215b02 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java index f68ba1ccb376..2a1caf54f2c2 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java index aee703609307..4e0de650e718 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java index ff8059b1df2f..81817d280bde 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 64ce9b34b3a5..42064859d31f 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 @@ -6,14 +6,14 @@ import com.sun.jersey.multipart.FormDataParam; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index aa93e350cf01..9ec6e5ebb592 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 8ec3bc61171e..384ad237be8a 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 188218d7f8ce..6f0319642091 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 @@ -8,15 +8,15 @@ import io.swagger.jaxrs.*; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; 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 a6ac294ff429..595b5ce2a289 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 @@ -6,15 +6,15 @@ import com.sun.jersey.multipart.FormDataParam; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java index 0b5a6256e57c..c0362bd92cf9 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java index c1e3d168cce9..8261ce51a081 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java index 8b264671b46e..1bfd16fcfa2c 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java index ff8059b1df2f..81817d280bde 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 39ad737f4e8a..e053e9efce2d 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 @@ -6,15 +6,15 @@ import com.sun.jersey.multipart.FormDataParam; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 8c6ed665c94b..a66ae6a59076 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 8ec3bc61171e..384ad237be8a 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 1c33d651b21e..f72490e0043b 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 @@ -8,14 +8,14 @@ import io.swagger.jaxrs.*; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import java.io.File; import java.util.Map; import java.util.List; 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 04525b1f5df3..0d11e2da81eb 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 @@ -6,14 +6,14 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java index a046d7cfa9e4..51f6d340e8e7 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java index c1479cf71905..1612dd57126c 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java index 99c5047915d0..371620a33c0c 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java index 885579d9f0f2..bb0bf81d730b 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 a0aab5f5ddfb..a8d4193e0650 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 @@ -4,14 +4,14 @@ import org.openapitools.model.*; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 0d819b4333a0..b7769ef248b0 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 1e67037417eb..c9350ef90764 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 dbac80bce28b..44f5a0a6d09c 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 @@ -8,15 +8,15 @@ import io.swagger.jaxrs.*; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; 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 ef99e405ede4..d3217fa9fddf 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 @@ -6,15 +6,15 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java index f426e3d49b9b..806e2c3deffa 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java index 1f44eee7c800..334f372eddfe 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java index eb37ae7f4e61..10b9944705df 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java index 885579d9f0f2..bb0bf81d730b 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 e7e51e70e841..c8e8df3b0929 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 @@ -4,15 +4,15 @@ import org.openapitools.model.*; import java.math.BigDecimal; -import org.openapitools.model.Client; +import org.openapitools.model.XmlItem; import java.util.Date; -import java.io.File; -import org.openapitools.model.FileSchemaTestClass; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 8e3cf747147a..aae7e4cc707c 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 1e67037417eb..c9350ef90764 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php index 0cf1ef82a85d..b9403e739b47 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php @@ -29,8 +29,8 @@ namespace OpenAPI\Server\Api; use Symfony\Component\HttpFoundation\File\UploadedFile; -use OpenAPI\Server\Model\ApiResponse; use OpenAPI\Server\Model\Pet; +use OpenAPI\Server\Model\ApiResponse; /** * PetApiInterface Interface Doc Comment diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php index ba7ecc50c5c8..155e658e442e 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php @@ -36,8 +36,8 @@ use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\Validator\Constraints as Assert; use OpenAPI\Server\Api\PetApiInterface; -use OpenAPI\Server\Model\ApiResponse; use OpenAPI\Server\Model\Pet; +use OpenAPI\Server\Model\ApiResponse; /** * PetController Class Doc Comment diff --git a/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py b/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py index ad7557832bab..920b874d94d1 100644 --- a/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py +++ b/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py @@ -1,8 +1,8 @@ from typing import List, Dict from aiohttp import web -from openapi_server.models.api_response import ApiResponse from openapi_server.models.pet import Pet +from openapi_server.models.api_response import ApiResponse from openapi_server import util diff --git a/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py b/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py index ad7557832bab..920b874d94d1 100644 --- a/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py +++ b/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py @@ -1,8 +1,8 @@ from typing import List, Dict from aiohttp import web -from openapi_server.models.api_response import ApiResponse from openapi_server.models.pet import Pet +from openapi_server.models.api_response import ApiResponse from openapi_server import util diff --git a/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py b/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py index 17699957ddd3..9fc53652c37b 100644 --- a/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py +++ b/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py @@ -1,8 +1,8 @@ import connexion import six -from openapi_server.models.api_response import ApiResponse # noqa: E501 from openapi_server.models.pet import Pet # noqa: E501 +from openapi_server.models.api_response import ApiResponse # noqa: E501 from openapi_server import util 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 25c244ded220..931e2a5c7b02 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.XmlItem; +import java.time.OffsetDateTime; import java.time.LocalDate; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java index 6883dcacee84..c66e74e11ed9 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java index ea131aed2712..92ab0920b231 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 779131b34af8..0f9d86d67584 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.XmlItem; import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.Map; -import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Client; +import java.time.LocalDateTime; +import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java index 23311c253bbd..b97b84b2decd 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java index e135ad2702c0..ced42fd53068 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 364b70eb9fd4..8c654484aabf 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; +import java.util.Map; import org.openapitools.model.Client; +import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.threeten.bp.OffsetDateTime; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java index 68f42954ab3b..40317a694636 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; +import java.util.Map; import org.openapitools.model.Client; +import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.threeten.bp.OffsetDateTime; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java index 0c13bf4b97de..eff7de581e7c 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java index ac991356a7a6..36ade80d2a14 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java @@ -1,9 +1,9 @@ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java index fe89b207bfee..71196c412f77 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java index b03098aa747f..65d283fbe5ed 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 364b70eb9fd4..8c654484aabf 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; +import java.util.Map; import org.openapitools.model.Client; +import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.threeten.bp.OffsetDateTime; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java index 75f81592a13b..0b805ec72dff 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; +import java.util.Map; import org.openapitools.model.Client; +import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.threeten.bp.OffsetDateTime; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java index 0c13bf4b97de..eff7de581e7c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java index 6621ae38e156..a02a4b4ae432 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java @@ -1,9 +1,9 @@ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index fe89b207bfee..71196c412f77 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java index 1a02c0b756d1..e03e7db060b8 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 6be604287145..24c011750f6a 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.XmlItem; +import java.time.OffsetDateTime; import java.time.LocalDate; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; 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 48f9c6a1ae63..b9d5bf504efd 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 @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.XmlItem; +import java.time.OffsetDateTime; import java.time.LocalDate; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java index fd05628030b4..7a41bd9c8489 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java index 5a70de5ef3e6..d2f27d568a0e 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -1,9 +1,9 @@ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index 17d14a277fb0..d9628f3f0881 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java index 5091e7e1f2cc..e203a274c533 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 364b70eb9fd4..8c654484aabf 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; +import java.util.Map; import org.openapitools.model.Client; +import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.threeten.bp.OffsetDateTime; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java index d61d01c66ba6..3090481a14c3 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; +import java.util.Map; import org.openapitools.model.Client; +import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.threeten.bp.OffsetDateTime; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 c28f5b8e99fb..497d91a58367 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 @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; +import java.util.Map; import org.openapitools.model.Client; +import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import org.threeten.bp.OffsetDateTime; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index 0c13bf4b97de..eff7de581e7c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java index 4a8a378932dc..ed8bd9223381 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java @@ -1,9 +1,9 @@ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java index 426aeb269488..b65110d5fb1e 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -1,9 +1,9 @@ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index fe89b207bfee..71196c412f77 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java index ad6c539471b0..7e9c6fcdf290 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java index a7bfc60e1289..b6c6bd2479d1 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; 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 b1cd89769a8d..b07045866c39 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.XmlItem; +import java.time.OffsetDateTime; import java.time.LocalDate; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index 05b6668260fd..ba27bd7548ed 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 7ee3a40eb744..a0ca400938c4 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 203c4720538e..38b61255e044 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.XmlItem; +import java.time.OffsetDateTime; import java.time.LocalDate; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; 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 e3bf18868356..a7152a1c49f4 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 @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.XmlItem; +import java.time.OffsetDateTime; import java.time.LocalDate; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java index 1eb822dea268..24678be69419 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java index f8c2b92e9989..b961079ce65f 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -1,9 +1,9 @@ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index 68b06d86791b..2f9ac5da521a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java index 37457faadcd1..bd3885549461 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 b0855540d130..001fb57173b8 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.XmlItem; +import java.time.OffsetDateTime; import java.time.LocalDate; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java index 53c4221aacd1..399de7a71922 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index e135ad2702c0..ced42fd53068 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 c02b842be9bb..d4b4277e0271 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 @@ -6,16 +6,16 @@ package org.openapitools.virtualan.api; import java.math.BigDecimal; -import org.openapitools.virtualan.model.Client; +import java.time.OffsetDateTime; +import org.openapitools.virtualan.model.ModelApiResponse; import org.openapitools.virtualan.model.FileSchemaTestClass; import java.time.LocalDate; import java.util.Map; -import org.openapitools.virtualan.model.ModelApiResponse; -import java.time.OffsetDateTime; -import org.openapitools.virtualan.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.virtualan.model.User; +import org.openapitools.virtualan.model.OuterComposite; import org.openapitools.virtualan.model.XmlItem; +import org.openapitools.virtualan.model.Client; +import org.springframework.core.io.Resource; import io.swagger.annotations.*; import io.virtualan.annotation.ApiVirtual; import io.virtualan.annotation.VirtualService; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java index fbe40637013a..927be38e8a32 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.virtualan.api; -import org.openapitools.virtualan.model.ModelApiResponse; +import java.util.Set; import org.openapitools.virtualan.model.Pet; +import org.openapitools.virtualan.model.ModelApiResponse; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import io.virtualan.annotation.ApiVirtual; import io.virtualan.annotation.VirtualService; 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 637dabcf2d2e..0737c362f42c 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.Client; -import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.XmlItem; +import java.time.OffsetDateTime; import java.time.LocalDate; import java.util.Map; -import org.openapitools.model.ModelApiResponse; -import java.time.OffsetDateTime; +import org.openapitools.model.Client; +import org.openapitools.model.FileSchemaTestClass; +import org.openapitools.model.User; import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.openapitools.model.User; -import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index 23311c253bbd..b97b84b2decd 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; +import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; -import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index e135ad2702c0..ced42fd53068 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; From b3fc17e687f12923cc1724d6871d26e402ec0730 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Fri, 10 Jul 2020 20:18:11 +0200 Subject: [PATCH 09/33] sort imports alphabetically --- .../org/openapitools/codegen/DefaultGenerator.java | 8 ++++++++ .../client/petstore/cpp-restsdk/client/api/PetApi.h | 4 ++-- .../petstore/cpp-restsdk/client/api/StoreApi.h | 2 +- .../client/petstore/cpp-restsdk/client/api/UserApi.h | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 2 +- .../org/openapitools/client/api/FakeApiImpl.java | 2 +- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/PetApiImpl.java | 2 +- .../org/openapitools/client/api/rxjava/FakeApi.java | 2 +- .../org/openapitools/client/api/rxjava/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../petstore/javascript-es6/src/api/FakeApi.js | 6 +++--- .../javascript-promise-es6/src/api/FakeApi.js | 6 +++--- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- samples/client/petstore/lua/petstore/api/pet_api.lua | 2 +- .../client/petstore/nim/petstore/apis/api_pet.nim | 2 +- .../scala/org/openapitools/client/api/PetApi.scala | 2 +- .../scala/org/openapitools/client/api/PetApi.scala | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../api/another/level/pet-api.ts | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 8 ++++---- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../server/src/handlers/OAIPetApiHandler.h | 4 ++-- .../server/src/requests/OAIPetApiRequest.h | 4 ++-- .../src/gen/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../java/org/openapitools/api/FakeApiService.java | 8 ++++---- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 8 ++++---- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../com/puppies/store/apis/StoreApiController.java | 2 +- .../puppies/store/apis/StoreApiControllerImp.java | 2 +- .../store/apis/StoreApiControllerImpInterface.java | 2 +- .../com/puppies/store/apis/UserApiController.java | 2 +- .../com/puppies/store/apis/UserApiControllerImp.java | 2 +- .../store/apis/UserApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../controllers/StoreApiControllerImpInterface.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../controllers/UserApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/FakeApiController.java | 12 ++++++------ .../app/controllers/FakeApiControllerImp.java | 12 ++++++------ .../controllers/FakeApiControllerImpInterface.java | 12 ++++++------ .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../controllers/StoreApiControllerImpInterface.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../controllers/UserApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../controllers/StoreApiControllerImpInterface.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../controllers/UserApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../controllers/StoreApiControllerImpInterface.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../controllers/UserApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../controllers/StoreApiControllerImpInterface.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../controllers/UserApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../controllers/StoreApiControllerImpInterface.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../controllers/UserApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../controllers/StoreApiControllerImpInterface.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../controllers/UserApiControllerImpInterface.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/api/FakeApiService.java | 10 +++++----- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 10 +++++----- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/api/FakeApiService.java | 10 +++++----- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 10 +++++----- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 6 +++--- .../java/org/openapitools/api/FakeApiService.java | 6 +++--- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 6 +++--- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../java/org/openapitools/api/FakeApiService.java | 8 ++++---- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 8 ++++---- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 6 +++--- .../java/org/openapitools/api/FakeApiService.java | 6 +++--- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 6 +++--- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../java/org/openapitools/api/FakeApiService.java | 8 ++++---- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 8 ++++---- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../SymfonyBundle-php/Api/PetApiInterface.php | 2 +- .../SymfonyBundle-php/Controller/PetController.php | 2 +- .../src/openapi_server/controllers/pet_controller.py | 2 +- .../openapi_server/controllers/pet_controller.py | 2 +- .../openapi_server/controllers/pet_controller.py | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/api/FakeApiController.java | 10 +++++----- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiController.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/api/FakeApiController.java | 10 +++++----- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiController.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../java/org/openapitools/api/FakeApiDelegate.java | 8 ++++---- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiDelegate.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/api/FakeApiController.java | 10 +++++----- .../java/org/openapitools/api/FakeApiDelegate.java | 10 +++++----- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiController.java | 2 +- .../java/org/openapitools/api/StoreApiDelegate.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../java/org/openapitools/api/FakeApiDelegate.java | 8 ++++---- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiDelegate.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/virtualan/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/virtualan/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- 279 files changed, 536 insertions(+), 528 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 4af7f7c1d408..402c6190288b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -1122,6 +1122,14 @@ private List> toImportsObjects(Map mappedImpor result.add(im); } }); + Collections.sort(result, new Comparator>() { + @Override + public int compare(final Map o1, final Map o2) { + String s1 = o1.values().iterator().next(); + String s2 = o2.values().iterator().next(); + return s1.compareTo(s2); + } + }); return result; } diff --git a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h index 1e0d62e38b74..c4956f5eec17 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h @@ -21,10 +21,10 @@ #include "../ApiClient.h" +#include "ApiResponse.h" +#include "HttpContent.h" #include "Pet.h" #include -#include "HttpContent.h" -#include "ApiResponse.h" #include diff --git a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h index 63fb34622df0..ca6e53d696a5 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h @@ -21,9 +21,9 @@ #include "../ApiClient.h" -#include #include "Order.h" #include +#include #include diff --git a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h index 27436bbf7745..2cd57055bfc9 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h @@ -21,9 +21,9 @@ #include "../ApiClient.h" -#include -#include #include "User.h" +#include +#include #include diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java index fb5192d45e2b..bd16713d28a0 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java @@ -3,15 +3,15 @@ import org.openapitools.client.ApiClient; import org.openapitools.client.EncodingUtils; +import java.io.File; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java index e07c2af926e5..a19427da4d5d 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java @@ -3,10 +3,10 @@ import org.openapitools.client.ApiClient; import org.openapitools.client.EncodingUtils; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java index dfad8d56f1c6..699ff4bcdf79 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java @@ -2,15 +2,15 @@ import org.openapitools.client.ApiClient; +import java.io.File; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import com.fasterxml.jackson.core.type.TypeReference; import com.google.api.client.http.EmptyContent; diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java index 0a0ec4730c87..c816655feeb9 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import com.fasterxml.jackson.core.type.TypeReference; import com.google.api.client.http.EmptyContent; diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java index d19e7c0bbb9e..f221c11553a4 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java @@ -20,15 +20,15 @@ import org.openapitools.client.model.*; import org.openapitools.client.Pair; +import java.io.File; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java index 6bd7ecd2377b..2ba4f4a7c390 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java @@ -20,10 +20,10 @@ import org.openapitools.client.model.*; import org.openapitools.client.Pair; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.util.ArrayList; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java index 9336de9d9333..a91332e3b3ca 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java @@ -8,14 +8,14 @@ import javax.ws.rs.core.GenericType; +import java.io.File; import java.math.BigDecimal; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java index 5e115b7d0218..f009c8168a9c 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java @@ -8,10 +8,10 @@ import javax.ws.rs.core.GenericType; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java index 3c48c279ff82..33f6b0d2fe28 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java @@ -24,9 +24,9 @@ package org.openapitools.client.api; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.io.File; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java index a3330651c056..e5f489951b7b 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java @@ -16,14 +16,14 @@ import org.openapitools.client.ApiException; import org.openapitools.client.Pair; +import java.io.File; import java.math.BigDecimal; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java index 0673014831a8..eb1c030a866c 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java @@ -16,10 +16,10 @@ import org.openapitools.client.ApiException; import org.openapitools.client.Pair; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java index 37a30c416deb..3bdabd558190 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java @@ -17,14 +17,14 @@ import org.openapitools.client.ApiResponse; import org.openapitools.client.Pair; +import java.io.File; import java.math.BigDecimal; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java index 481a8149d82d..c0c2b6b730ed 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java @@ -17,10 +17,10 @@ import org.openapitools.client.ApiResponse; import org.openapitools.client.Pair; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java index 3d39888ffe2e..44f90fcfcd4a 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java @@ -27,15 +27,15 @@ import java.io.IOException; +import java.io.File; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java index decfb61979b9..b4864fc4c279 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java @@ -27,10 +27,10 @@ import java.io.IOException; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java index 3d39888ffe2e..44f90fcfcd4a 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -27,15 +27,15 @@ import java.io.IOException; +import java.io.File; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java index decfb61979b9..b4864fc4c279 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java @@ -27,10 +27,10 @@ import java.io.IOException; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java index 75065e75f285..62e642b93fc2 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -13,14 +13,14 @@ package org.openapitools.client.api; +import java.io.File; import java.math.BigDecimal; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java index 4bd86ad6016b..fa9d67a307e4 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java @@ -13,10 +13,10 @@ package org.openapitools.client.api; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.Arrays; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java index 06ea289ede66..18b95a2d7a31 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java @@ -14,15 +14,15 @@ package org.openapitools.client.api; import com.google.gson.reflect.TypeToken; +import java.io.File; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.Arrays; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java index 8290407226fd..2a2729457c3e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java @@ -14,10 +14,10 @@ package org.openapitools.client.api; import com.google.gson.reflect.TypeToken; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.Arrays; diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java index 4df72b06a5ed..09dabcc77b64 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java @@ -7,15 +7,15 @@ import javax.ws.rs.core.GenericType; +import java.io.File; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java index 7139c28d6de7..aeb853714224 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java @@ -7,10 +7,10 @@ import javax.ws.rs.core.GenericType; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java index 7d6f1db15326..df16820eb564 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java @@ -2,15 +2,15 @@ import org.openapitools.client.ApiClient; +import java.io.File; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.Collections; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java index a789c8a23fa3..40700606c8af 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.Collections; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java index 7d6f1db15326..df16820eb564 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java @@ -2,15 +2,15 @@ import org.openapitools.client.ApiClient; +import java.io.File; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.Collections; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java index a789c8a23fa3..40700606c8af 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.Collections; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java index 7c9b330658da..27bc1fbbed82 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java @@ -11,15 +11,15 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; +import java.io.File; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java index 58a21df55e47..c8bcf7bf7266 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java @@ -11,10 +11,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java index b9e5b5cb752c..88e57ccb110c 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -9,15 +9,15 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; +import java.io.File; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java index 56dbc56f5f43..f2b20fd87bc6 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java @@ -9,10 +9,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java index 898afdaec6ec..acf61aa5f0e9 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -10,15 +10,15 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; +import java.io.File; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java index 0ae965f9cde4..ba2f30e37a7d 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java @@ -10,10 +10,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java index a8ee355bc642..97135b5d82b4 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java @@ -10,15 +10,15 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; +import java.io.File; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java index 492b2626ce0e..c6079a7fc000 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java @@ -10,10 +10,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java index d64369a228d7..9d38b670752d 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java @@ -3,8 +3,8 @@ import org.openapitools.client.ApiClient; import io.vertx.core.file.AsyncFile; import java.math.BigDecimal; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java index db6d5f6c7459..b377770b87ea 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java @@ -2,8 +2,8 @@ import io.vertx.core.file.AsyncFile; import java.math.BigDecimal; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApi.java index ef76f70591a6..6baf73c236af 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,9 +2,9 @@ import org.openapitools.client.ApiClient; import io.vertx.core.file.AsyncFile; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; import io.vertx.core.json.JsonObject; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java index b9c8a9034c42..9743aa827c09 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java @@ -1,9 +1,9 @@ package org.openapitools.client.api; import io.vertx.core.file.AsyncFile; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java index 2d091ff47764..9588d738cff9 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java @@ -2,8 +2,8 @@ import io.vertx.core.file.AsyncFile; import java.math.BigDecimal; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java index ceeec1744846..ec06d8d9784c 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java @@ -1,9 +1,9 @@ package org.openapitools.client.api.rxjava; import io.vertx.core.file.AsyncFile; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; import org.openapitools.client.ApiClient; import java.util.*; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java index 75edd95c8dcf..ec9b4ef06256 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java @@ -2,14 +2,14 @@ import org.openapitools.client.ApiClient; +import java.io.File; import java.math.BigDecimal; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.HashMap; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java index e9301d51967b..b594d5343a7f 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; +import java.io.File; +import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.util.Set; -import java.io.File; import java.util.HashMap; import java.util.List; diff --git a/samples/client/petstore/javascript-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-es6/src/api/FakeApi.js index ee2757ad8696..bfb8488e1bdb 100644 --- a/samples/client/petstore/javascript-es6/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-es6/src/api/FakeApi.js @@ -13,12 +13,12 @@ import ApiClient from "../ApiClient"; -import OuterComposite from '../model/OuterComposite'; -import HealthCheckResult from '../model/HealthCheckResult'; -import User from '../model/User'; import Client from '../model/Client'; import FileSchemaTestClass from '../model/FileSchemaTestClass'; +import HealthCheckResult from '../model/HealthCheckResult'; +import OuterComposite from '../model/OuterComposite'; import Pet from '../model/Pet'; +import User from '../model/User'; /** * Fake service. diff --git a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js index 662e53e96c61..60668b32a9af 100644 --- a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js @@ -13,12 +13,12 @@ import ApiClient from "../ApiClient"; -import OuterComposite from '../model/OuterComposite'; -import HealthCheckResult from '../model/HealthCheckResult'; -import User from '../model/User'; import Client from '../model/Client'; import FileSchemaTestClass from '../model/FileSchemaTestClass'; +import HealthCheckResult from '../model/HealthCheckResult'; +import OuterComposite from '../model/OuterComposite'; import Pet from '../model/Pet'; +import User from '../model/User'; /** * Fake service. diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0cf64291d804..60f72b51af95 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0cf64291d804..60f72b51af95 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index e7afb5f3424e..584c6ef06867 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index d7e18365d9d0..1cff24913d64 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0cf64291d804..60f72b51af95 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt index b9816034a981..e164a6cf4d06 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.* import io.ktor.client.request.forms.formData diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 4f5d1ed15d4d..5e930e963956 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0d8d2a061477..4b9faa2a2c46 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0cf64291d804..60f72b51af95 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 3add84ff4a24..f3f9c057d241 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -5,8 +5,8 @@ import retrofit2.http.* import retrofit2.Call import okhttp3.RequestBody -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet interface PetApi { /** diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 3c740a3c6e7b..c95dd04f915e 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0cf64291d804..60f72b51af95 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0cf64291d804..60f72b51af95 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/lua/petstore/api/pet_api.lua b/samples/client/petstore/lua/petstore/api/pet_api.lua index 4c018ad70699..02e0392c3e26 100644 --- a/samples/client/petstore/lua/petstore/api/pet_api.lua +++ b/samples/client/petstore/lua/petstore/api/pet_api.lua @@ -16,8 +16,8 @@ local dkjson = require "dkjson" local basexx = require "basexx" -- model import -local petstore_pet = require "petstore.model.pet" local petstore_api_response = require "petstore.model.api_response" +local petstore_pet = require "petstore.model.pet" local pet_api = {} local pet_api_mt = { diff --git a/samples/client/petstore/nim/petstore/apis/api_pet.nim b/samples/client/petstore/nim/petstore/apis/api_pet.nim index 5bed84c0290e..9858c523647e 100644 --- a/samples/client/petstore/nim/petstore/apis/api_pet.nim +++ b/samples/client/petstore/nim/petstore/apis/api_pet.nim @@ -18,8 +18,8 @@ import tables import typetraits import uri -import ../models/model_pet import ../models/model_api_response +import ../models/model_pet const basepath = "http://petstore.swagger.io/v2" diff --git a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala index 83fd02239fef..0641cae5ba8e 100644 --- a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala +++ b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala @@ -12,8 +12,8 @@ package org.openapitools.client.api import java.io.File -import org.openapitools.client.model.Pet import org.openapitools.client.model.ApiResponse +import org.openapitools.client.model.Pet import org.openapitools.client.core._ import org.openapitools.client.core.CollectionFormats._ import org.openapitools.client.core.ApiKeyLocations._ diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala index ba5d29519a76..a8a7ed3fedbb 100644 --- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala +++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala @@ -12,8 +12,8 @@ package org.openapitools.client.api import java.io.File -import org.openapitools.client.model.Pet import org.openapitools.client.model.ApiResponse +import org.openapitools.client.model.Pet import org.openapitools.client.core.JsonSupport._ import sttp.client._ import sttp.model.Method diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index 7f31865a428d..2a6251140f4d 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index dc4be5d4716a..75e8d381d799 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index 1aebeb1ae5b6..e47b3272c439 100644 --- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts index 1c9c70d786c3..688c880a0feb 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts @@ -20,9 +20,9 @@ import { Configuration } from '../../../configuration'; // @ts-ignore import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../../../base'; // @ts-ignore -import { Pet } from '../../../model/some/levels/deep'; -// @ts-ignore import { ApiResponse } from '../../../model/some/levels/deep'; +// @ts-ignore +import { Pet } from '../../../model/some/levels/deep'; /** * PetApi - axios parameter creator * @export diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java index b0120750b5c0..ddf3b6a26e30 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java @@ -8,16 +8,16 @@ import javax.ws.rs.core.GenericType; +import java.io.File; import java.math.BigDecimal; -import java.time.OffsetDateTime; import java.time.LocalDate; -import org.openapitools.client.model.HealthCheckResult; +import java.time.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.openapitools.client.model.OuterEnum; +import org.openapitools.client.model.HealthCheckResult; import org.openapitools.client.model.OuterComposite; +import org.openapitools.client.model.OuterEnum; import org.openapitools.client.model.User; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java index f92185d4296b..3637b9e61a5a 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java @@ -8,9 +8,9 @@ import javax.ws.rs.core.GenericType; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h index c639fac6e944..4bc371414335 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h @@ -14,10 +14,10 @@ #include -#include "OAIPet.h" +#include "OAIApiResponse.h" #include "OAIHttpFileElement.h" +#include "OAIPet.h" #include -#include "OAIApiResponse.h" namespace OpenAPI { diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h index 872ef81a6e96..70b650ffb6ca 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h @@ -19,10 +19,10 @@ #include #include -#include "OAIPet.h" +#include "OAIApiResponse.h" #include "OAIHttpFileElement.h" +#include "OAIPet.h" #include -#include "OAIApiResponse.h" #include "OAIPetApiHandler.h" namespace OpenAPI { 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 dd6457f95a08..512d61dfc256 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 @@ -7,16 +7,16 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; 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 5c8e94505121..2e66a57b5405 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 @@ -6,16 +6,16 @@ import org.wso2.msf4j.formparam.FormDataParam; import org.wso2.msf4j.formparam.FileInfo; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java index 6a31ff87c4cd..04474e6b8284 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java index 365a69fffccd..3a8b6aedd8b6 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java @@ -6,10 +6,10 @@ import org.wso2.msf4j.formparam.FormDataParam; import org.wso2.msf4j.formparam.FileInfo; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java index c386dd5ffdb6..63dd05bf4d65 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java index af3f9c325523..0bcd337aa217 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java @@ -6,8 +6,8 @@ import org.wso2.msf4j.formparam.FormDataParam; import org.wso2.msf4j.formparam.FileInfo; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 3e15fc5acc3d..6dc63e48b600 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 @@ -3,16 +3,16 @@ import org.openapitools.api.*; import org.openapitools.model.*; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 234f1f7d20be..44ad4001a2cb 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 680f3d984b57..7c4535b1f100 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java index 4a1e7d140799..2c55a419a783 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java @@ -1,7 +1,7 @@ package com.puppies.store.apis; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java index 956d5f73b3e9..24f6169eb3fa 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package com.puppies.store.apis; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImpInterface.java index 4f2aadae998c..a6699863d063 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package com.puppies.store.apis; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java index e335fdadf6c9..759911475345 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java @@ -1,7 +1,7 @@ package com.puppies.store.apis; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java index 9e2aebd99181..009e619b12df 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java @@ -1,7 +1,7 @@ package com.puppies.store.apis; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImpInterface.java index 4904073cbc2e..234c9a0a713a 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package com.puppies.store.apis; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java index a0b75c6524fa..7eddeba4cfea 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java index 322dc5cfe196..35d3ba68f4c9 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImpInterface.java index 60022bb1d234..df0b42abf63d 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java index d84e39fb5860..67e7afa3fae4 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java index 916ed4cc14c4..2b13253a5d32 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImpInterface.java index 09b1d5042f02..35b001748cfc 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java index 2861687f718a..7f337734cc7a 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java index 42e6ca4952e2..44635faeb951 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Controller; import play.mvc.Result; 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 e8f663725389..1258f3e66ae9 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 @@ -1,15 +1,15 @@ package controllers; -import java.math.BigDecimal; import apimodels.Client; -import java.time.OffsetDateTime; +import apimodels.FileSchemaTestClass; +import apimodels.OuterComposite; +import apimodels.User; import apimodels.XmlItem; +import java.io.InputStream; +import java.math.BigDecimal; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; -import apimodels.User; -import apimodels.OuterComposite; -import apimodels.FileSchemaTestClass; -import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; 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 f184b499b929..a9e88885c9ab 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 @@ -1,15 +1,15 @@ package controllers; -import java.math.BigDecimal; import apimodels.Client; -import java.time.OffsetDateTime; +import apimodels.FileSchemaTestClass; +import apimodels.OuterComposite; +import apimodels.User; import apimodels.XmlItem; +import java.io.InputStream; +import java.math.BigDecimal; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; -import apimodels.User; -import apimodels.OuterComposite; -import apimodels.FileSchemaTestClass; -import java.io.InputStream; import play.mvc.Http; import java.util.List; 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 a7bea418492c..5dbbaf7ec7b5 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 @@ -1,15 +1,15 @@ package controllers; -import java.math.BigDecimal; import apimodels.Client; -import java.time.OffsetDateTime; +import apimodels.FileSchemaTestClass; +import apimodels.OuterComposite; +import apimodels.User; import apimodels.XmlItem; +import java.io.InputStream; +import java.math.BigDecimal; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; -import apimodels.User; -import apimodels.OuterComposite; -import apimodels.FileSchemaTestClass; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java index 8597930c5e50..43d89bee7c61 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java @@ -2,8 +2,8 @@ import apimodels.ModelApiResponse; import apimodels.Pet; -import java.util.Set; import java.io.InputStream; +import java.util.Set; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java index 6b74f7452d47..781ea1426baa 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java @@ -2,8 +2,8 @@ import apimodels.ModelApiResponse; import apimodels.Pet; -import java.util.Set; import java.io.InputStream; +import java.util.Set; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java index 03bf9419d5e0..083232d6f333 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java @@ -2,8 +2,8 @@ import apimodels.ModelApiResponse; import apimodels.Pet; -import java.util.Set; import java.io.InputStream; +import java.util.Set; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java index fc02da21aa92..e8dbd98c6c03 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java index d0d354a167cc..60e2a7516d1e 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImpInterface.java index b42e4d6d3d02..355da258c19a 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java index f5ad46830546..6a689ba45c51 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java index 573053bb537f..307827a165ac 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImpInterface.java index 1290c84835fb..1cc68cfc1265 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java index 14a1bc066621..70d9924ebbb7 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java index 0728571e5e5e..d28950e5802b 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImpInterface.java index 7a9c3fd82e85..10a050f71982 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java index af9953802765..2d0e7e619ab5 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java index 2ef2abaaff8a..92dcc962eea2 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImpInterface.java index 8c5a5ee0af64..88f07d997df4 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java index c4ef06649928..9fbc67aa8aad 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java index 477ad09d5d71..dbe0d3203ac4 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImpInterface.java index 70d313028c6e..3a1ba6d49a4a 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java index 27c3af3e2cdd..592e4497d00b 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java index 251ffce1f09b..f85851ef3bd5 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java index c79d4b93820f..96144c988dd8 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java index 96d2fc5eab8a..38a423e8952c 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java index 2ac36157699f..dbd542a7b4f3 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java index bb94da53b956..90a63e898599 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java index d69bd467a77f..567e1d85974b 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java index fc02da21aa92..e8dbd98c6c03 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java index d0d354a167cc..60e2a7516d1e 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImpInterface.java index b42e4d6d3d02..355da258c19a 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java index f5ad46830546..6a689ba45c51 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java index 573053bb537f..307827a165ac 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImpInterface.java index 1290c84835fb..1cc68cfc1265 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java index 07a66bd7f5e4..b82fd13c264d 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java index d0d354a167cc..60e2a7516d1e 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImpInterface.java index b42e4d6d3d02..355da258c19a 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java index 83aec5cb9257..ea579e9c3962 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java index 573053bb537f..307827a165ac 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImpInterface.java index 1290c84835fb..1cc68cfc1265 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java index fc02da21aa92..e8dbd98c6c03 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java index d0d354a167cc..60e2a7516d1e 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java index b42e4d6d3d02..355da258c19a 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import java.util.Map; import apimodels.Order; +import java.util.Map; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java index f5ad46830546..6a689ba45c51 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java index 573053bb537f..307827a165ac 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java index 1290c84835fb..1cc68cfc1265 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import java.util.List; import apimodels.User; +import java.util.List; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java index e42d567086fc..c7b7d71de6e4 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java @@ -1,8 +1,8 @@ package org.openapitools.api; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java index abb3cca7fa39..9e7a74b714d4 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java index 4b22dceb8574..edc0727d90c3 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java @@ -1,8 +1,8 @@ package org.openapitools.api; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import org.openapitools.api.PetApiService; import javax.ws.rs.*; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java index 51e88462a8ef..a6baa2c99775 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java @@ -6,9 +6,9 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.Multipart; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java index d2b1ef792add..0bfebfdb536e 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import org.openapitools.api.StoreApiService; import javax.ws.rs.*; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java index 0c215fed7382..3135d74bb98e 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java @@ -6,8 +6,8 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.Multipart; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index d7a0becfec7c..f841e096bf51 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index f1c6b21d694c..50ea94a966cc 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -5,8 +5,8 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java index 050d2f1f0c8c..8bad72910f4b 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java @@ -1,8 +1,8 @@ package org.openapitools.api; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java index f2023aa2ef55..0fe7ed001bc8 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.io.InputStream; import java.io.OutputStream; 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 a9667ca950d6..543fabbe3bd9 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 @@ -1,15 +1,15 @@ package org.openapitools.api; -import org.joda.time.LocalDate; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; +import org.joda.time.LocalDate; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; import org.openapitools.model.OuterComposite; -import java.io.File; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java index 0a47ecc2f6c8..8ac13c2f5623 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java index 09280258ad31..6cbc74824492 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.io.InputStream; import java.io.OutputStream; 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 a073c10cd244..18aadbf334ea 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 @@ -7,17 +7,17 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.Map; import java.util.List; 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 60c132cd230b..b3de6f71a38e 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 @@ -5,17 +5,17 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java index 806e2c3deffa..92920604c8b3 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java index 334f372eddfe..d4c952da00f3 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java index 10b9944705df..eb37ae7f4e61 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java index bb0bf81d730b..885579d9f0f2 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 4fc0ced7b9e7..cad327b08802 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 @@ -3,17 +3,17 @@ import org.openapitools.api.*; import org.openapitools.model.*; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index aae7e4cc707c..a6e2c8a62acd 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index c9350ef90764..1e67037417eb 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 065c05514b53..1584a27667aa 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 @@ -7,17 +7,17 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; +import java.io.File; import java.math.BigDecimal; import java.util.Date; -import org.openapitools.model.HealthCheckResult; -import org.openapitools.model.Pet; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.HealthCheckResult; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.Pet; +import org.openapitools.model.User; import java.util.Map; import java.util.List; 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 a609af9c3842..2aa06cb823c2 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 @@ -5,17 +5,17 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import java.io.File; import java.math.BigDecimal; import java.util.Date; -import org.openapitools.model.HealthCheckResult; -import org.openapitools.model.Pet; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.HealthCheckResult; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.Pet; +import org.openapitools.model.User; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java index e647cd46b367..2049e604b87d 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java @@ -7,9 +7,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java index 58f687f9ac0f..9271117c1c77 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,9 +5,9 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java index 6df25c0e9846..54a5de5fc1c7 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java index b6103464536d..db5973e5e18d 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 4793964a32dc..16245013c73e 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 @@ -3,17 +3,17 @@ import org.openapitools.api.*; import org.openapitools.model.*; +import java.io.File; import java.math.BigDecimal; import java.util.Date; -import org.openapitools.model.HealthCheckResult; -import org.openapitools.model.Pet; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import org.openapitools.model.HealthCheckResult; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.Pet; +import org.openapitools.model.User; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index a1a5e2d3e9ab..fc29b062439b 100644 --- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,9 +3,9 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 812afff4f939..ea00608349fb 100644 --- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java index a97fcb32891f..327b00e46c73 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java @@ -6,9 +6,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java index dccc85aaf652..5415004bc635 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java index c67a244d7dbe..a79712327381 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java @@ -6,8 +6,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java index a56abf7bf5a5..ed4c8338a600 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 904864d5143d..0b264cc92ced 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 9553108dc08f..4669635c2590 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java index 3234ec661302..5b44c238acb1 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java @@ -5,9 +5,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java index a76b74bf330e..8408fb1d4c97 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 7aad23e3d410..50a3d2f99c38 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 371e223ca7f5..262a0fb0005a 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java index 3234ec661302..5b44c238acb1 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java @@ -5,9 +5,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java index a76b74bf330e..8408fb1d4c97 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 7aad23e3d410..50a3d2f99c38 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 371e223ca7f5..262a0fb0005a 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java index 3234ec661302..5b44c238acb1 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java @@ -5,9 +5,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java index a76b74bf330e..8408fb1d4c97 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 7aad23e3d410..50a3d2f99c38 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 371e223ca7f5..262a0fb0005a 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java index a97fcb32891f..327b00e46c73 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java @@ -6,9 +6,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java index dccc85aaf652..5415004bc635 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java index c67a244d7dbe..a79712327381 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java @@ -6,8 +6,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java index a56abf7bf5a5..ed4c8338a600 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 904864d5143d..0b264cc92ced 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 9553108dc08f..4669635c2590 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 e4aaafa06e06..ddbff66229b9 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 @@ -1,16 +1,16 @@ package org.openapitools.api; -import org.joda.time.LocalDate; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; +import org.joda.time.LocalDate; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java index d639612b5be6..390179baf034 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java index c67a2a777e65..b40ba06efdef 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import javax.ws.rs.*; import javax.ws.rs.core.Response; 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 70fc5611978c..96eefb5e28b6 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 @@ -1,16 +1,16 @@ package org.openapitools.api; -import org.joda.time.LocalDate; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; +import org.joda.time.LocalDate; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java index c15aeb1203bb..4a71f8a63b55 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java index 93562fb4e975..c55cdddea894 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import javax.ws.rs.*; import javax.ws.rs.core.Response; 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 8b85d11da16a..b4438dcd2035 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 @@ -7,15 +7,15 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; import org.openapitools.model.OuterComposite; -import java.io.File; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.Map; import java.util.List; 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 d2fb8f1b63f7..34d18cba98e5 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 @@ -5,15 +5,15 @@ import com.sun.jersey.multipart.FormDataParam; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; import org.openapitools.model.OuterComposite; -import java.io.File; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java index 4bd2a4215b02..cb82dd09684c 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java index 2a1caf54f2c2..4ddeb10e02ab 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java index 4e0de650e718..aee703609307 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java index 81817d280bde..ff8059b1df2f 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 42064859d31f..40783f37731f 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 @@ -5,15 +5,15 @@ import com.sun.jersey.multipart.FormDataParam; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; import org.openapitools.model.OuterComposite; -import java.io.File; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 9ec6e5ebb592..acc06645f948 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 384ad237be8a..8ec3bc61171e 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 6f0319642091..6745291086b1 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 @@ -7,16 +7,16 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.Map; import java.util.List; 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 595b5ce2a289..1a0d6eab8d41 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 @@ -5,16 +5,16 @@ import com.sun.jersey.multipart.FormDataParam; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java index c0362bd92cf9..481d0ad94ed6 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java index 8261ce51a081..91269b18959a 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java index 1bfd16fcfa2c..8b264671b46e 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java index 81817d280bde..ff8059b1df2f 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 e053e9efce2d..1b4a47d08c0e 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 @@ -5,16 +5,16 @@ import com.sun.jersey.multipart.FormDataParam; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index a66ae6a59076..dd1d3f6f93c4 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 384ad237be8a..8ec3bc61171e 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 f72490e0043b..face994d6ab2 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 @@ -7,15 +7,15 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; import org.openapitools.model.OuterComposite; -import java.io.File; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.Map; import java.util.List; 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 0d11e2da81eb..d84d578c266f 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 @@ -5,15 +5,15 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; import org.openapitools.model.OuterComposite; -import java.io.File; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java index 51f6d340e8e7..d178a93e8127 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java index 1612dd57126c..5004414a7011 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java index 371620a33c0c..99c5047915d0 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java index bb0bf81d730b..885579d9f0f2 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 a8d4193e0650..fd2fd9976c7b 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 @@ -3,15 +3,15 @@ import org.openapitools.api.*; import org.openapitools.model.*; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; import org.openapitools.model.OuterComposite; -import java.io.File; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index b7769ef248b0..de44686db43b 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index c9350ef90764..1e67037417eb 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 44f5a0a6d09c..16a74e777d6a 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 @@ -7,16 +7,16 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.Map; import java.util.List; 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 d3217fa9fddf..a664f7468fff 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 @@ -5,16 +5,16 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java index 806e2c3deffa..92920604c8b3 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java index 334f372eddfe..d4c952da00f3 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java index 10b9944705df..eb37ae7f4e61 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java index bb0bf81d730b..885579d9f0f2 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 c8e8df3b0929..c03364a7a4af 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 @@ -3,16 +3,16 @@ import org.openapitools.api.*; import org.openapitools.model.*; +import java.io.File; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index aae7e4cc707c..a6e2c8a62acd 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index c9350ef90764..1e67037417eb 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php index b9403e739b47..0cf1ef82a85d 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php @@ -29,8 +29,8 @@ namespace OpenAPI\Server\Api; use Symfony\Component\HttpFoundation\File\UploadedFile; -use OpenAPI\Server\Model\Pet; use OpenAPI\Server\Model\ApiResponse; +use OpenAPI\Server\Model\Pet; /** * PetApiInterface Interface Doc Comment diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php index 155e658e442e..ba7ecc50c5c8 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php @@ -36,8 +36,8 @@ use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\Validator\Constraints as Assert; use OpenAPI\Server\Api\PetApiInterface; -use OpenAPI\Server\Model\Pet; use OpenAPI\Server\Model\ApiResponse; +use OpenAPI\Server\Model\Pet; /** * PetController Class Doc Comment diff --git a/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py b/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py index 920b874d94d1..ad7557832bab 100644 --- a/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py +++ b/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py @@ -1,8 +1,8 @@ from typing import List, Dict from aiohttp import web -from openapi_server.models.pet import Pet from openapi_server.models.api_response import ApiResponse +from openapi_server.models.pet import Pet from openapi_server import util diff --git a/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py b/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py index 920b874d94d1..ad7557832bab 100644 --- a/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py +++ b/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py @@ -1,8 +1,8 @@ from typing import List, Dict from aiohttp import web -from openapi_server.models.pet import Pet from openapi_server.models.api_response import ApiResponse +from openapi_server.models.pet import Pet from openapi_server import util diff --git a/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py b/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py index 9fc53652c37b..17699957ddd3 100644 --- a/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py +++ b/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py @@ -1,8 +1,8 @@ import connexion import six -from openapi_server.models.pet import Pet # noqa: E501 from openapi_server.models.api_response import ApiResponse # noqa: E501 +from openapi_server.models.pet import Pet # noqa: E501 from openapi_server import util 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 931e2a5c7b02..cd3b341fd465 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 @@ -6,15 +6,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java index 92ab0920b231..ea131aed2712 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 0f9d86d67584..f4144a85abc5 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 @@ -6,15 +6,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Map; import org.openapitools.model.Client; -import java.time.LocalDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java index ced42fd53068..e135ad2702c0 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 8c654484aabf..21704d49df9d 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Map; import org.openapitools.model.Client; -import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java index 40317a694636..350d1c7fee75 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Map; import org.openapitools.model.Client; -import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java index 71196c412f77..fe89b207bfee 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java index 65d283fbe5ed..b03098aa747f 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 8c654484aabf..21704d49df9d 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Map; import org.openapitools.model.Client; -import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java index 0b805ec72dff..97aae53d5b4b 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Map; import org.openapitools.model.Client; -import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index 71196c412f77..fe89b207bfee 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java index e03e7db060b8..1a02c0b756d1 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 24c011750f6a..de58af2ffd9f 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 @@ -6,15 +6,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; 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 b9d5bf504efd..00935ffc8331 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 @@ -1,15 +1,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index d9628f3f0881..17d14a277fb0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java index e203a274c533..5091e7e1f2cc 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 8c654484aabf..21704d49df9d 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Map; import org.openapitools.model.Client; -import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java index 3090481a14c3..abe01baaf914 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Map; import org.openapitools.model.Client; -import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 497d91a58367..ef94e8a2c163 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 @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; import java.util.Map; import org.openapitools.model.Client; -import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.threeten.bp.LocalDate; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; +import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 71196c412f77..fe89b207bfee 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java index 7e9c6fcdf290..ad6c539471b0 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java index b6c6bd2479d1..a7bfc60e1289 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; 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 b07045866c39..89e7e08b2b1d 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 @@ -6,15 +6,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index a0ca400938c4..7ee3a40eb744 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 38b61255e044..37b372853e5d 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 @@ -6,15 +6,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; 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 a7152a1c49f4..daa444e9967c 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 @@ -1,15 +1,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index 2f9ac5da521a..68b06d86791b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java index bd3885549461..37457faadcd1 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 001fb57173b8..3bf161ea6fb5 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 @@ -6,15 +6,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index ced42fd53068..e135ad2702c0 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 d4b4277e0271..236896f82c72 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 @@ -6,15 +6,15 @@ package org.openapitools.virtualan.api; import java.math.BigDecimal; -import java.time.OffsetDateTime; -import org.openapitools.virtualan.model.ModelApiResponse; -import org.openapitools.virtualan.model.FileSchemaTestClass; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; -import org.openapitools.virtualan.model.User; +import org.openapitools.virtualan.model.Client; +import org.openapitools.virtualan.model.FileSchemaTestClass; +import org.openapitools.virtualan.model.ModelApiResponse; import org.openapitools.virtualan.model.OuterComposite; +import org.openapitools.virtualan.model.User; import org.openapitools.virtualan.model.XmlItem; -import org.openapitools.virtualan.model.Client; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import io.virtualan.annotation.ApiVirtual; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java index 927be38e8a32..2d8915631e39 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java @@ -6,8 +6,8 @@ package org.openapitools.virtualan.api; import java.util.Set; -import org.openapitools.virtualan.model.Pet; import org.openapitools.virtualan.model.ModelApiResponse; +import org.openapitools.virtualan.model.Pet; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import io.virtualan.annotation.ApiVirtual; 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 0737c362f42c..1bc992a2d1d6 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 @@ -6,15 +6,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index ced42fd53068..e135ad2702c0 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; From bcfdc66b52b5051c4073c77aaa07d25b997da1f6 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Fri, 10 Jul 2020 20:24:03 +0200 Subject: [PATCH 10/33] sort imports alphabetically with right key --- .../org/openapitools/codegen/DefaultGenerator.java | 4 ++-- .../client/petstore/cpp-restsdk/client/api/PetApi.h | 4 ++-- .../petstore/cpp-restsdk/client/api/StoreApi.h | 2 +- .../client/petstore/cpp-restsdk/client/api/UserApi.h | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 2 +- .../org/openapitools/client/api/FakeApiImpl.java | 2 +- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/PetApiImpl.java | 2 +- .../org/openapitools/client/api/rxjava/FakeApi.java | 2 +- .../org/openapitools/client/api/rxjava/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 4 ++-- .../petstore/javascript-es6/src/api/FakeApi.js | 6 +++--- .../javascript-promise-es6/src/api/FakeApi.js | 6 +++--- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- samples/client/petstore/lua/petstore/api/pet_api.lua | 2 +- .../client/petstore/nim/petstore/apis/api_pet.nim | 2 +- .../scala/org/openapitools/client/api/PetApi.scala | 2 +- .../scala/org/openapitools/client/api/PetApi.scala | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../api/another/level/pet-api.ts | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 8 ++++---- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../server/src/handlers/OAIPetApiHandler.h | 4 ++-- .../server/src/requests/OAIPetApiRequest.h | 4 ++-- .../src/gen/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../java/org/openapitools/api/FakeApiService.java | 8 ++++---- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 8 ++++---- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../com/puppies/store/apis/StoreApiController.java | 2 +- .../puppies/store/apis/StoreApiControllerImp.java | 2 +- .../store/apis/StoreApiControllerImpInterface.java | 2 +- .../com/puppies/store/apis/UserApiController.java | 2 +- .../com/puppies/store/apis/UserApiControllerImp.java | 2 +- .../store/apis/UserApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../controllers/StoreApiControllerImpInterface.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../controllers/UserApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/FakeApiController.java | 12 ++++++------ .../app/controllers/FakeApiControllerImp.java | 12 ++++++------ .../controllers/FakeApiControllerImpInterface.java | 12 ++++++------ .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../controllers/StoreApiControllerImpInterface.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../controllers/UserApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../controllers/StoreApiControllerImpInterface.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../controllers/UserApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../controllers/StoreApiControllerImpInterface.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../controllers/UserApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../controllers/StoreApiControllerImpInterface.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../controllers/UserApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../controllers/StoreApiControllerImpInterface.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../controllers/UserApiControllerImpInterface.java | 2 +- .../app/controllers/StoreApiController.java | 2 +- .../app/controllers/StoreApiControllerImp.java | 2 +- .../controllers/StoreApiControllerImpInterface.java | 2 +- .../app/controllers/UserApiController.java | 2 +- .../app/controllers/UserApiControllerImp.java | 2 +- .../controllers/UserApiControllerImpInterface.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/api/FakeApiService.java | 10 +++++----- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 10 +++++----- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/api/FakeApiService.java | 10 +++++----- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 10 +++++----- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 6 +++--- .../java/org/openapitools/api/FakeApiService.java | 6 +++--- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 6 +++--- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../java/org/openapitools/api/FakeApiService.java | 8 ++++---- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 8 ++++---- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 6 +++--- .../java/org/openapitools/api/FakeApiService.java | 6 +++--- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 6 +++--- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../java/org/openapitools/api/FakeApiService.java | 8 ++++---- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/PetApiService.java | 4 ++-- .../src/gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 8 ++++---- .../org/openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../SymfonyBundle-php/Api/PetApiInterface.php | 2 +- .../SymfonyBundle-php/Controller/PetController.php | 2 +- .../src/openapi_server/controllers/pet_controller.py | 2 +- .../openapi_server/controllers/pet_controller.py | 2 +- .../openapi_server/controllers/pet_controller.py | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/api/FakeApiController.java | 10 +++++----- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiController.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/api/FakeApiController.java | 10 +++++----- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiController.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../java/org/openapitools/api/FakeApiDelegate.java | 8 ++++---- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiDelegate.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/api/FakeApiController.java | 10 +++++----- .../java/org/openapitools/api/FakeApiDelegate.java | 10 +++++----- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiController.java | 2 +- .../java/org/openapitools/api/StoreApiDelegate.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../java/org/openapitools/api/FakeApiDelegate.java | 8 ++++---- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiDelegate.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/virtualan/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/virtualan/api/PetApi.java | 2 +- .../src/main/java/org/openapitools/api/FakeApi.java | 8 ++++---- .../src/main/java/org/openapitools/api/StoreApi.java | 2 +- 279 files changed, 530 insertions(+), 530 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 402c6190288b..18f7ada4a54a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -1125,8 +1125,8 @@ private List> toImportsObjects(Map mappedImpor Collections.sort(result, new Comparator>() { @Override public int compare(final Map o1, final Map o2) { - String s1 = o1.values().iterator().next(); - String s2 = o2.values().iterator().next(); + String s1 = o1.get("classname"); + String s2 = o1.get("classname"); return s1.compareTo(s2); } }); diff --git a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h index c4956f5eec17..1e0d62e38b74 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h @@ -21,10 +21,10 @@ #include "../ApiClient.h" -#include "ApiResponse.h" -#include "HttpContent.h" #include "Pet.h" #include +#include "HttpContent.h" +#include "ApiResponse.h" #include diff --git a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h index ca6e53d696a5..63fb34622df0 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h @@ -21,9 +21,9 @@ #include "../ApiClient.h" +#include #include "Order.h" #include -#include #include diff --git a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h index 2cd57055bfc9..27436bbf7745 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h @@ -21,9 +21,9 @@ #include "../ApiClient.h" -#include "User.h" -#include #include +#include +#include "User.h" #include diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java index bd16713d28a0..fb5192d45e2b 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java @@ -3,15 +3,15 @@ import org.openapitools.client.ApiClient; import org.openapitools.client.EncodingUtils; -import java.io.File; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java index a19427da4d5d..e07c2af926e5 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java @@ -3,10 +3,10 @@ import org.openapitools.client.ApiClient; import org.openapitools.client.EncodingUtils; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java index 699ff4bcdf79..dfad8d56f1c6 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java @@ -2,15 +2,15 @@ import org.openapitools.client.ApiClient; -import java.io.File; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import com.fasterxml.jackson.core.type.TypeReference; import com.google.api.client.http.EmptyContent; diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java index c816655feeb9..0a0ec4730c87 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import com.fasterxml.jackson.core.type.TypeReference; import com.google.api.client.http.EmptyContent; diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java index f221c11553a4..d19e7c0bbb9e 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java @@ -20,15 +20,15 @@ import org.openapitools.client.model.*; import org.openapitools.client.Pair; -import java.io.File; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java index 2ba4f4a7c390..6bd7ecd2377b 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java @@ -20,10 +20,10 @@ import org.openapitools.client.model.*; import org.openapitools.client.Pair; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.util.ArrayList; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java index a91332e3b3ca..9336de9d9333 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java @@ -8,14 +8,14 @@ import javax.ws.rs.core.GenericType; -import java.io.File; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java index f009c8168a9c..5e115b7d0218 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java @@ -8,10 +8,10 @@ import javax.ws.rs.core.GenericType; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java index 33f6b0d2fe28..3c48c279ff82 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java @@ -24,9 +24,9 @@ package org.openapitools.client.api; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.io.File; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java index e5f489951b7b..a3330651c056 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java @@ -16,14 +16,14 @@ import org.openapitools.client.ApiException; import org.openapitools.client.Pair; -import java.io.File; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java index eb1c030a866c..0673014831a8 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java @@ -16,10 +16,10 @@ import org.openapitools.client.ApiException; import org.openapitools.client.Pair; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java index 3bdabd558190..37a30c416deb 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java @@ -17,14 +17,14 @@ import org.openapitools.client.ApiResponse; import org.openapitools.client.Pair; -import java.io.File; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java index c0c2b6b730ed..481a8149d82d 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java @@ -17,10 +17,10 @@ import org.openapitools.client.ApiResponse; import org.openapitools.client.Pair; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java index 44f90fcfcd4a..3d39888ffe2e 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java @@ -27,15 +27,15 @@ import java.io.IOException; -import java.io.File; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java index b4864fc4c279..decfb61979b9 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java @@ -27,10 +27,10 @@ import java.io.IOException; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java index 44f90fcfcd4a..3d39888ffe2e 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -27,15 +27,15 @@ import java.io.IOException; -import java.io.File; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java index b4864fc4c279..decfb61979b9 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java @@ -27,10 +27,10 @@ import java.io.IOException; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java index 62e642b93fc2..75065e75f285 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -13,14 +13,14 @@ package org.openapitools.client.api; -import java.io.File; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java index fa9d67a307e4..4bd86ad6016b 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java @@ -13,10 +13,10 @@ package org.openapitools.client.api; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.Arrays; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java index 18b95a2d7a31..06ea289ede66 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java @@ -14,15 +14,15 @@ package org.openapitools.client.api; import com.google.gson.reflect.TypeToken; -import java.io.File; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.Arrays; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java index 2a2729457c3e..8290407226fd 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java @@ -14,10 +14,10 @@ package org.openapitools.client.api; import com.google.gson.reflect.TypeToken; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.Arrays; diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java index 09dabcc77b64..4df72b06a5ed 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java @@ -7,15 +7,15 @@ import javax.ws.rs.core.GenericType; -import java.io.File; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java index aeb853714224..7139c28d6de7 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java @@ -7,10 +7,10 @@ import javax.ws.rs.core.GenericType; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java index df16820eb564..7d6f1db15326 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java @@ -2,15 +2,15 @@ import org.openapitools.client.ApiClient; -import java.io.File; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.Collections; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java index 40700606c8af..a789c8a23fa3 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.Collections; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java index df16820eb564..7d6f1db15326 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java @@ -2,15 +2,15 @@ import org.openapitools.client.ApiClient; -import java.io.File; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.Collections; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java index 40700606c8af..a789c8a23fa3 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.Collections; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java index 27bc1fbbed82..7c9b330658da 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java @@ -11,15 +11,15 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; -import java.io.File; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java index c8bcf7bf7266..58a21df55e47 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java @@ -11,10 +11,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java index 88e57ccb110c..b9e5b5cb752c 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -9,15 +9,15 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; -import java.io.File; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java index f2b20fd87bc6..56dbc56f5f43 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java @@ -9,10 +9,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java index acf61aa5f0e9..898afdaec6ec 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -10,15 +10,15 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; -import java.io.File; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java index ba2f30e37a7d..0ae965f9cde4 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java @@ -10,10 +10,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java index 97135b5d82b4..a8ee355bc642 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java @@ -10,15 +10,15 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; -import java.io.File; import java.math.BigDecimal; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import org.threeten.bp.LocalDate; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java index c6079a7fc000..492b2626ce0e 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java @@ -10,10 +10,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java index 9d38b670752d..d64369a228d7 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java @@ -3,8 +3,8 @@ import org.openapitools.client.ApiClient; import io.vertx.core.file.AsyncFile; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java index b377770b87ea..db6d5f6c7459 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java @@ -2,8 +2,8 @@ import io.vertx.core.file.AsyncFile; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApi.java index 6baf73c236af..ef76f70591a6 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,9 +2,9 @@ import org.openapitools.client.ApiClient; import io.vertx.core.file.AsyncFile; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; import io.vertx.core.json.JsonObject; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java index 9743aa827c09..b9c8a9034c42 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java @@ -1,9 +1,9 @@ package org.openapitools.client.api; import io.vertx.core.file.AsyncFile; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java index 9588d738cff9..2d091ff47764 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java @@ -2,8 +2,8 @@ import io.vertx.core.file.AsyncFile; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java index ec06d8d9784c..ceeec1744846 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java @@ -1,9 +1,9 @@ package org.openapitools.client.api.rxjava; import io.vertx.core.file.AsyncFile; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; import org.openapitools.client.ApiClient; import java.util.*; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java index ec9b4ef06256..75edd95c8dcf 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java @@ -2,14 +2,14 @@ import org.openapitools.client.ApiClient; -import java.io.File; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.OffsetDateTime; +import java.time.LocalDate; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.HashMap; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java index b594d5343a7f..e9301d51967b 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; -import java.io.File; -import java.util.Set; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.util.Set; +import java.io.File; import java.util.HashMap; import java.util.List; diff --git a/samples/client/petstore/javascript-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-es6/src/api/FakeApi.js index bfb8488e1bdb..ee2757ad8696 100644 --- a/samples/client/petstore/javascript-es6/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-es6/src/api/FakeApi.js @@ -13,12 +13,12 @@ import ApiClient from "../ApiClient"; +import OuterComposite from '../model/OuterComposite'; +import HealthCheckResult from '../model/HealthCheckResult'; +import User from '../model/User'; import Client from '../model/Client'; import FileSchemaTestClass from '../model/FileSchemaTestClass'; -import HealthCheckResult from '../model/HealthCheckResult'; -import OuterComposite from '../model/OuterComposite'; import Pet from '../model/Pet'; -import User from '../model/User'; /** * Fake service. diff --git a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js index 60668b32a9af..662e53e96c61 100644 --- a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js @@ -13,12 +13,12 @@ import ApiClient from "../ApiClient"; +import OuterComposite from '../model/OuterComposite'; +import HealthCheckResult from '../model/HealthCheckResult'; +import User from '../model/User'; import Client from '../model/Client'; import FileSchemaTestClass from '../model/FileSchemaTestClass'; -import HealthCheckResult from '../model/HealthCheckResult'; -import OuterComposite from '../model/OuterComposite'; import Pet from '../model/Pet'; -import User from '../model/User'; /** * Fake service. diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 60f72b51af95..0cf64291d804 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 60f72b51af95..0cf64291d804 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 584c6ef06867..e7afb5f3424e 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 1cff24913d64..d7e18365d9d0 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 60f72b51af95..0cf64291d804 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt index e164a6cf4d06..b9816034a981 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.* import io.ktor.client.request.forms.formData diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 5e930e963956..4f5d1ed15d4d 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 4b9faa2a2c46..0d8d2a061477 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 60f72b51af95..0cf64291d804 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index f3f9c057d241..3add84ff4a24 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -5,8 +5,8 @@ import retrofit2.http.* import retrofit2.Call import okhttp3.RequestBody -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse interface PetApi { /** diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index c95dd04f915e..3c740a3c6e7b 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 60f72b51af95..0cf64291d804 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 60f72b51af95..0cf64291d804 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.ApiResponse import org.openapitools.client.models.Pet +import org.openapitools.client.models.ApiResponse import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/lua/petstore/api/pet_api.lua b/samples/client/petstore/lua/petstore/api/pet_api.lua index 02e0392c3e26..4c018ad70699 100644 --- a/samples/client/petstore/lua/petstore/api/pet_api.lua +++ b/samples/client/petstore/lua/petstore/api/pet_api.lua @@ -16,8 +16,8 @@ local dkjson = require "dkjson" local basexx = require "basexx" -- model import -local petstore_api_response = require "petstore.model.api_response" local petstore_pet = require "petstore.model.pet" +local petstore_api_response = require "petstore.model.api_response" local pet_api = {} local pet_api_mt = { diff --git a/samples/client/petstore/nim/petstore/apis/api_pet.nim b/samples/client/petstore/nim/petstore/apis/api_pet.nim index 9858c523647e..5bed84c0290e 100644 --- a/samples/client/petstore/nim/petstore/apis/api_pet.nim +++ b/samples/client/petstore/nim/petstore/apis/api_pet.nim @@ -18,8 +18,8 @@ import tables import typetraits import uri -import ../models/model_api_response import ../models/model_pet +import ../models/model_api_response const basepath = "http://petstore.swagger.io/v2" diff --git a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala index 0641cae5ba8e..83fd02239fef 100644 --- a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala +++ b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala @@ -12,8 +12,8 @@ package org.openapitools.client.api import java.io.File -import org.openapitools.client.model.ApiResponse import org.openapitools.client.model.Pet +import org.openapitools.client.model.ApiResponse import org.openapitools.client.core._ import org.openapitools.client.core.CollectionFormats._ import org.openapitools.client.core.ApiKeyLocations._ diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala index a8a7ed3fedbb..ba5d29519a76 100644 --- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala +++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala @@ -12,8 +12,8 @@ package org.openapitools.client.api import java.io.File -import org.openapitools.client.model.ApiResponse import org.openapitools.client.model.Pet +import org.openapitools.client.model.ApiResponse import org.openapitools.client.core.JsonSupport._ import sttp.client._ import sttp.model.Method diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index 2a6251140f4d..7f31865a428d 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 75e8d381d799..dc4be5d4716a 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index e47b3272c439..1aebeb1ae5b6 100644 --- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts index 688c880a0feb..1c9c70d786c3 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts @@ -20,9 +20,9 @@ import { Configuration } from '../../../configuration'; // @ts-ignore import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../../../base'; // @ts-ignore -import { ApiResponse } from '../../../model/some/levels/deep'; -// @ts-ignore import { Pet } from '../../../model/some/levels/deep'; +// @ts-ignore +import { ApiResponse } from '../../../model/some/levels/deep'; /** * PetApi - axios parameter creator * @export diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java index ddf3b6a26e30..b0120750b5c0 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java @@ -8,16 +8,16 @@ import javax.ws.rs.core.GenericType; -import java.io.File; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.OffsetDateTime; +import java.time.LocalDate; +import org.openapitools.client.model.HealthCheckResult; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; -import org.openapitools.client.model.HealthCheckResult; -import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.OuterEnum; +import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java index 3637b9e61a5a..f92185d4296b 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java @@ -8,9 +8,9 @@ import javax.ws.rs.core.GenericType; -import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h index 4bc371414335..c639fac6e944 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h @@ -14,10 +14,10 @@ #include -#include "OAIApiResponse.h" -#include "OAIHttpFileElement.h" #include "OAIPet.h" +#include "OAIHttpFileElement.h" #include +#include "OAIApiResponse.h" namespace OpenAPI { diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h index 70b650ffb6ca..872ef81a6e96 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h @@ -19,10 +19,10 @@ #include #include -#include "OAIApiResponse.h" -#include "OAIHttpFileElement.h" #include "OAIPet.h" +#include "OAIHttpFileElement.h" #include +#include "OAIApiResponse.h" #include "OAIPetApiHandler.h" namespace OpenAPI { 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 512d61dfc256..dd6457f95a08 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 @@ -7,16 +7,16 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; 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 2e66a57b5405..5c8e94505121 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 @@ -6,16 +6,16 @@ import org.wso2.msf4j.formparam.FormDataParam; import org.wso2.msf4j.formparam.FileInfo; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java index 04474e6b8284..6a31ff87c4cd 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java index 3a8b6aedd8b6..365a69fffccd 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java @@ -6,10 +6,10 @@ import org.wso2.msf4j.formparam.FormDataParam; import org.wso2.msf4j.formparam.FileInfo; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java index 63dd05bf4d65..c386dd5ffdb6 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java index 0bcd337aa217..af3f9c325523 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java @@ -6,8 +6,8 @@ import org.wso2.msf4j.formparam.FormDataParam; import org.wso2.msf4j.formparam.FileInfo; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 6dc63e48b600..3e15fc5acc3d 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 @@ -3,16 +3,16 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 44ad4001a2cb..234f1f7d20be 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 7c4535b1f100..680f3d984b57 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java index 2c55a419a783..4a1e7d140799 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java @@ -1,7 +1,7 @@ package com.puppies.store.apis; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java index 24f6169eb3fa..956d5f73b3e9 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package com.puppies.store.apis; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImpInterface.java index a6699863d063..4f2aadae998c 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package com.puppies.store.apis; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java index 759911475345..e335fdadf6c9 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java @@ -1,7 +1,7 @@ package com.puppies.store.apis; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java index 009e619b12df..9e2aebd99181 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java @@ -1,7 +1,7 @@ package com.puppies.store.apis; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImpInterface.java index 234c9a0a713a..4904073cbc2e 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package com.puppies.store.apis; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java index 7eddeba4cfea..a0b75c6524fa 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java index 35d3ba68f4c9..322dc5cfe196 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImpInterface.java index df0b42abf63d..60022bb1d234 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java index 67e7afa3fae4..d84e39fb5860 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java index 2b13253a5d32..916ed4cc14c4 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImpInterface.java index 35b001748cfc..09b1d5042f02 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java index 7f337734cc7a..2861687f718a 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java index 44635faeb951..42e6ca4952e2 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Controller; import play.mvc.Result; 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 1258f3e66ae9..e8f663725389 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 @@ -1,15 +1,15 @@ package controllers; +import java.math.BigDecimal; import apimodels.Client; -import apimodels.FileSchemaTestClass; -import apimodels.OuterComposite; -import apimodels.User; +import java.time.OffsetDateTime; import apimodels.XmlItem; -import java.io.InputStream; -import java.math.BigDecimal; import java.time.LocalDate; -import java.time.OffsetDateTime; import java.util.Map; +import apimodels.User; +import apimodels.OuterComposite; +import apimodels.FileSchemaTestClass; +import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; 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 a9e88885c9ab..f184b499b929 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 @@ -1,15 +1,15 @@ package controllers; +import java.math.BigDecimal; import apimodels.Client; -import apimodels.FileSchemaTestClass; -import apimodels.OuterComposite; -import apimodels.User; +import java.time.OffsetDateTime; import apimodels.XmlItem; -import java.io.InputStream; -import java.math.BigDecimal; import java.time.LocalDate; -import java.time.OffsetDateTime; import java.util.Map; +import apimodels.User; +import apimodels.OuterComposite; +import apimodels.FileSchemaTestClass; +import java.io.InputStream; import play.mvc.Http; import java.util.List; 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 5dbbaf7ec7b5..a7bea418492c 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 @@ -1,15 +1,15 @@ package controllers; +import java.math.BigDecimal; import apimodels.Client; -import apimodels.FileSchemaTestClass; -import apimodels.OuterComposite; -import apimodels.User; +import java.time.OffsetDateTime; import apimodels.XmlItem; -import java.io.InputStream; -import java.math.BigDecimal; import java.time.LocalDate; -import java.time.OffsetDateTime; import java.util.Map; +import apimodels.User; +import apimodels.OuterComposite; +import apimodels.FileSchemaTestClass; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java index 43d89bee7c61..8597930c5e50 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java @@ -2,8 +2,8 @@ import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import java.util.Set; +import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java index 781ea1426baa..6b74f7452d47 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java @@ -2,8 +2,8 @@ import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import java.util.Set; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java index 083232d6f333..03bf9419d5e0 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java @@ -2,8 +2,8 @@ import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import java.util.Set; +import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java index e8dbd98c6c03..fc02da21aa92 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java index 60e2a7516d1e..d0d354a167cc 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImpInterface.java index 355da258c19a..b42e4d6d3d02 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java index 6a689ba45c51..f5ad46830546 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java index 307827a165ac..573053bb537f 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImpInterface.java index 1cc68cfc1265..1290c84835fb 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java index 70d9924ebbb7..14a1bc066621 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java index d28950e5802b..0728571e5e5e 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImpInterface.java index 10a050f71982..7a9c3fd82e85 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java index 2d0e7e619ab5..af9953802765 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java index 92dcc962eea2..2ef2abaaff8a 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImpInterface.java index 88f07d997df4..8c5a5ee0af64 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java index 9fbc67aa8aad..c4ef06649928 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java index dbe0d3203ac4..477ad09d5d71 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImpInterface.java index 3a1ba6d49a4a..70d313028c6e 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java index 592e4497d00b..27c3af3e2cdd 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java index f85851ef3bd5..251ffce1f09b 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java index 96144c988dd8..c79d4b93820f 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java index 38a423e8952c..96d2fc5eab8a 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java index dbd542a7b4f3..2ac36157699f 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java index 90a63e898599..bb94da53b956 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java index 567e1d85974b..d69bd467a77f 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java index e8dbd98c6c03..fc02da21aa92 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java index 60e2a7516d1e..d0d354a167cc 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImpInterface.java index 355da258c19a..b42e4d6d3d02 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java index 6a689ba45c51..f5ad46830546 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java index 307827a165ac..573053bb537f 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImpInterface.java index 1cc68cfc1265..1290c84835fb 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java index b82fd13c264d..07a66bd7f5e4 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java index 60e2a7516d1e..d0d354a167cc 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImpInterface.java index 355da258c19a..b42e4d6d3d02 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java index ea579e9c3962..83aec5cb9257 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java index 307827a165ac..573053bb537f 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImpInterface.java index 1cc68cfc1265..1290c84835fb 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java index e8dbd98c6c03..fc02da21aa92 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java index 60e2a7516d1e..d0d354a167cc 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java index 355da258c19a..b42e4d6d3d02 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.Order; import java.util.Map; +import apimodels.Order; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java index 6a689ba45c51..f5ad46830546 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java index 307827a165ac..573053bb537f 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java index 1cc68cfc1265..1290c84835fb 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java @@ -1,7 +1,7 @@ package controllers; -import apimodels.User; import java.util.List; +import apimodels.User; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java index c7b7d71de6e4..e42d567086fc 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java @@ -1,8 +1,8 @@ package org.openapitools.api; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java index 9e7a74b714d4..abb3cca7fa39 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java index edc0727d90c3..4b22dceb8574 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java @@ -1,8 +1,8 @@ package org.openapitools.api; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import org.openapitools.api.PetApiService; import javax.ws.rs.*; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java index a6baa2c99775..51e88462a8ef 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java @@ -6,9 +6,9 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.Multipart; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java index 0bfebfdb536e..d2b1ef792add 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import org.openapitools.api.StoreApiService; import javax.ws.rs.*; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java index 3135d74bb98e..0c215fed7382 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java @@ -6,8 +6,8 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.Multipart; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index f841e096bf51..d7a0becfec7c 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 50ea94a966cc..f1c6b21d694c 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -5,8 +5,8 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java index 8bad72910f4b..050d2f1f0c8c 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java @@ -1,8 +1,8 @@ package org.openapitools.api; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java index 0fe7ed001bc8..f2023aa2ef55 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.io.InputStream; import java.io.OutputStream; 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 543fabbe3bd9..a9667ca950d6 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 @@ -1,15 +1,15 @@ package org.openapitools.api; -import java.io.File; +import org.joda.time.LocalDate; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; -import org.joda.time.LocalDate; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import java.io.File; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java index 8ac13c2f5623..0a47ecc2f6c8 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java index 6cbc74824492..09280258ad31 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.io.InputStream; import java.io.OutputStream; 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 18aadbf334ea..a073c10cd244 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 @@ -7,17 +7,17 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; import java.math.BigDecimal; -import java.time.LocalDate; +import org.openapitools.model.XmlItem; import java.time.OffsetDateTime; +import java.time.LocalDate; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; 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 b3de6f71a38e..60c132cd230b 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 @@ -5,17 +5,17 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.io.File; import java.math.BigDecimal; -import java.time.LocalDate; +import org.openapitools.model.XmlItem; import java.time.OffsetDateTime; +import java.time.LocalDate; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java index 92920604c8b3..806e2c3deffa 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java index d4c952da00f3..334f372eddfe 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java index eb37ae7f4e61..10b9944705df 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java index 885579d9f0f2..bb0bf81d730b 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 cad327b08802..4fc0ced7b9e7 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 @@ -3,17 +3,17 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; import java.math.BigDecimal; -import java.time.LocalDate; +import org.openapitools.model.XmlItem; import java.time.OffsetDateTime; +import java.time.LocalDate; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index a6e2c8a62acd..aae7e4cc707c 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 1e67037417eb..c9350ef90764 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 1584a27667aa..065c05514b53 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 @@ -7,17 +7,17 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; import java.math.BigDecimal; import java.util.Date; +import org.openapitools.model.HealthCheckResult; +import org.openapitools.model.Pet; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.HealthCheckResult; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; -import org.openapitools.model.Pet; import org.openapitools.model.User; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; 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 2aa06cb823c2..a609af9c3842 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 @@ -5,17 +5,17 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.io.File; import java.math.BigDecimal; import java.util.Date; +import org.openapitools.model.HealthCheckResult; +import org.openapitools.model.Pet; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.HealthCheckResult; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; -import org.openapitools.model.Pet; import org.openapitools.model.User; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java index 2049e604b87d..e647cd46b367 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java @@ -7,9 +7,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java index 9271117c1c77..58f687f9ac0f 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,9 +5,9 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java index 54a5de5fc1c7..6df25c0e9846 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java index db5973e5e18d..b6103464536d 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 16245013c73e..4793964a32dc 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 @@ -3,17 +3,17 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; import java.math.BigDecimal; import java.util.Date; +import org.openapitools.model.HealthCheckResult; +import org.openapitools.model.Pet; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.HealthCheckResult; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; -import org.openapitools.model.Pet; import org.openapitools.model.User; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index fc29b062439b..a1a5e2d3e9ab 100644 --- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,9 +3,9 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index ea00608349fb..812afff4f939 100644 --- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java index 327b00e46c73..a97fcb32891f 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java @@ -6,9 +6,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java index 5415004bc635..dccc85aaf652 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java index a79712327381..c67a244d7dbe 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java @@ -6,8 +6,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java index ed4c8338a600..a56abf7bf5a5 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 0b264cc92ced..904864d5143d 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 4669635c2590..9553108dc08f 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java index 5b44c238acb1..3234ec661302 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java @@ -5,9 +5,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java index 8408fb1d4c97..a76b74bf330e 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 50a3d2f99c38..7aad23e3d410 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 262a0fb0005a..371e223ca7f5 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java index 5b44c238acb1..3234ec661302 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java @@ -5,9 +5,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java index 8408fb1d4c97..a76b74bf330e 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 50a3d2f99c38..7aad23e3d410 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 262a0fb0005a..371e223ca7f5 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java index 5b44c238acb1..3234ec661302 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java @@ -5,9 +5,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java index 8408fb1d4c97..a76b74bf330e 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 50a3d2f99c38..7aad23e3d410 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 262a0fb0005a..371e223ca7f5 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java index 327b00e46c73..a97fcb32891f 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java @@ -6,9 +6,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java index 5415004bc635..dccc85aaf652 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java index a79712327381..c67a244d7dbe 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java @@ -6,8 +6,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java index ed4c8338a600..a56abf7bf5a5 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 0b264cc92ced..904864d5143d 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import java.io.File; -import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 4669635c2590..9553108dc08f 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 ddbff66229b9..e4aaafa06e06 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 @@ -1,16 +1,16 @@ package org.openapitools.api; -import java.io.File; +import org.joda.time.LocalDate; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; -import org.joda.time.LocalDate; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java index 390179baf034..d639612b5be6 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java index b40ba06efdef..c67a2a777e65 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import javax.ws.rs.*; import javax.ws.rs.core.Response; 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 96eefb5e28b6..70fc5611978c 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 @@ -1,16 +1,16 @@ package org.openapitools.api; -import java.io.File; +import org.joda.time.LocalDate; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; -import org.joda.time.LocalDate; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java index 4a71f8a63b55..c15aeb1203bb 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java index c55cdddea894..93562fb4e975 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import javax.ws.rs.*; import javax.ws.rs.core.Response; 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 b4438dcd2035..8b85d11da16a 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 @@ -7,15 +7,15 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import java.io.File; import java.util.Map; import java.util.List; 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 34d18cba98e5..d2fb8f1b63f7 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 @@ -5,15 +5,15 @@ import com.sun.jersey.multipart.FormDataParam; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java index cb82dd09684c..4bd2a4215b02 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java index 4ddeb10e02ab..2a1caf54f2c2 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java index aee703609307..4e0de650e718 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java index ff8059b1df2f..81817d280bde 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 40783f37731f..42064859d31f 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 @@ -5,15 +5,15 @@ import com.sun.jersey.multipart.FormDataParam; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index acc06645f948..9ec6e5ebb592 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 8ec3bc61171e..384ad237be8a 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 6745291086b1..6f0319642091 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 @@ -7,16 +7,16 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; 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 1a0d6eab8d41..595b5ce2a289 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 @@ -5,16 +5,16 @@ import com.sun.jersey.multipart.FormDataParam; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java index 481d0ad94ed6..c0362bd92cf9 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java index 91269b18959a..8261ce51a081 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java index 8b264671b46e..1bfd16fcfa2c 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java index ff8059b1df2f..81817d280bde 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 1b4a47d08c0e..e053e9efce2d 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 @@ -5,16 +5,16 @@ import com.sun.jersey.multipart.FormDataParam; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index dd1d3f6f93c4..a66ae6a59076 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 8ec3bc61171e..384ad237be8a 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 face994d6ab2..f72490e0043b 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 @@ -7,15 +7,15 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import java.io.File; import java.util.Map; import java.util.List; 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 d84d578c266f..0d11e2da81eb 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 @@ -5,15 +5,15 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java index d178a93e8127..51f6d340e8e7 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java index 5004414a7011..1612dd57126c 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java index 99c5047915d0..371620a33c0c 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java index 885579d9f0f2..bb0bf81d730b 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 fd2fd9976c7b..a8d4193e0650 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 @@ -3,15 +3,15 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index de44686db43b..b7769ef248b0 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 1e67037417eb..c9350ef90764 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 16a74e777d6a..44f5a0a6d09c 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 @@ -7,16 +7,16 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.Map; import java.util.List; 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 a664f7468fff..d3217fa9fddf 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 @@ -5,16 +5,16 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java index 92920604c8b3..806e2c3deffa 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java index d4c952da00f3..334f372eddfe 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java index eb37ae7f4e61..10b9944705df 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java index 885579d9f0f2..bb0bf81d730b 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; 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 c03364a7a4af..c8e8df3b0929 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 @@ -3,16 +3,16 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Date; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index a6e2c8a62acd..aae7e4cc707c 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.io.File; +import org.openapitools.model.Pet; import java.util.Set; import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.Pet; +import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 1e67037417eb..c9350ef90764 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php index 0cf1ef82a85d..b9403e739b47 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php @@ -29,8 +29,8 @@ namespace OpenAPI\Server\Api; use Symfony\Component\HttpFoundation\File\UploadedFile; -use OpenAPI\Server\Model\ApiResponse; use OpenAPI\Server\Model\Pet; +use OpenAPI\Server\Model\ApiResponse; /** * PetApiInterface Interface Doc Comment diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php index ba7ecc50c5c8..155e658e442e 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php @@ -36,8 +36,8 @@ use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\Validator\Constraints as Assert; use OpenAPI\Server\Api\PetApiInterface; -use OpenAPI\Server\Model\ApiResponse; use OpenAPI\Server\Model\Pet; +use OpenAPI\Server\Model\ApiResponse; /** * PetController Class Doc Comment diff --git a/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py b/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py index ad7557832bab..920b874d94d1 100644 --- a/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py +++ b/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py @@ -1,8 +1,8 @@ from typing import List, Dict from aiohttp import web -from openapi_server.models.api_response import ApiResponse from openapi_server.models.pet import Pet +from openapi_server.models.api_response import ApiResponse from openapi_server import util diff --git a/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py b/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py index ad7557832bab..920b874d94d1 100644 --- a/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py +++ b/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py @@ -1,8 +1,8 @@ from typing import List, Dict from aiohttp import web -from openapi_server.models.api_response import ApiResponse from openapi_server.models.pet import Pet +from openapi_server.models.api_response import ApiResponse from openapi_server import util diff --git a/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py b/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py index 17699957ddd3..9fc53652c37b 100644 --- a/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py +++ b/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py @@ -1,8 +1,8 @@ import connexion import six -from openapi_server.models.api_response import ApiResponse # noqa: E501 from openapi_server.models.pet import Pet # noqa: E501 +from openapi_server.models.api_response import ApiResponse # noqa: E501 from openapi_server import util 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 cd3b341fd465..931e2a5c7b02 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 @@ -6,15 +6,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import java.time.LocalDate; +import org.openapitools.model.XmlItem; import java.time.OffsetDateTime; +import java.time.LocalDate; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java index ea131aed2712..92ab0920b231 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 f4144a85abc5..0f9d86d67584 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 @@ -6,15 +6,15 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.Map; import org.openapitools.model.Client; +import java.time.LocalDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java index e135ad2702c0..ced42fd53068 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 21704d49df9d..8c654484aabf 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Map; import org.openapitools.model.Client; +import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.threeten.bp.LocalDate; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java index 350d1c7fee75..40317a694636 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Map; import org.openapitools.model.Client; +import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.threeten.bp.LocalDate; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java index fe89b207bfee..71196c412f77 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java index b03098aa747f..65d283fbe5ed 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 21704d49df9d..8c654484aabf 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Map; import org.openapitools.model.Client; +import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.threeten.bp.LocalDate; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java index 97aae53d5b4b..0b805ec72dff 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Map; import org.openapitools.model.Client; +import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.threeten.bp.LocalDate; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index fe89b207bfee..71196c412f77 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java index 1a02c0b756d1..e03e7db060b8 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 de58af2ffd9f..24c011750f6a 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 @@ -6,15 +6,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import java.time.LocalDate; +import org.openapitools.model.XmlItem; import java.time.OffsetDateTime; +import java.time.LocalDate; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; 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 00935ffc8331..b9d5bf504efd 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 @@ -1,15 +1,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import java.time.LocalDate; +import org.openapitools.model.XmlItem; import java.time.OffsetDateTime; +import java.time.LocalDate; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index 17d14a277fb0..d9628f3f0881 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java index 5091e7e1f2cc..e203a274c533 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 21704d49df9d..8c654484aabf 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Map; import org.openapitools.model.Client; +import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.threeten.bp.LocalDate; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java index abe01baaf914..3090481a14c3 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Map; import org.openapitools.model.Client; +import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.threeten.bp.LocalDate; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 ef94e8a2c163..497d91a58367 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 @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; +import org.openapitools.model.XmlItem; import java.util.Map; import org.openapitools.model.Client; +import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; +import org.threeten.bp.LocalDate; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; -import org.threeten.bp.LocalDate; -import org.threeten.bp.OffsetDateTime; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index fe89b207bfee..71196c412f77 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java index ad6c539471b0..7e9c6fcdf290 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java index a7bfc60e1289..b6c6bd2479d1 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; 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 89e7e08b2b1d..b07045866c39 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 @@ -6,15 +6,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import java.time.LocalDate; +import org.openapitools.model.XmlItem; import java.time.OffsetDateTime; +import java.time.LocalDate; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 7ee3a40eb744..a0ca400938c4 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 37b372853e5d..38b61255e044 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 @@ -6,15 +6,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import java.time.LocalDate; +import org.openapitools.model.XmlItem; import java.time.OffsetDateTime; +import java.time.LocalDate; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; 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 daa444e9967c..a7152a1c49f4 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 @@ -1,15 +1,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import java.time.LocalDate; +import org.openapitools.model.XmlItem; import java.time.OffsetDateTime; +import java.time.LocalDate; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index 68b06d86791b..2f9ac5da521a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java index 37457faadcd1..bd3885549461 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 3bf161ea6fb5..001fb57173b8 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 @@ -6,15 +6,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import java.time.LocalDate; +import org.openapitools.model.XmlItem; import java.time.OffsetDateTime; +import java.time.LocalDate; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index e135ad2702c0..ced42fd53068 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 236896f82c72..d4b4277e0271 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 @@ -6,15 +6,15 @@ package org.openapitools.virtualan.api; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.OffsetDateTime; -import java.util.Map; -import org.openapitools.virtualan.model.Client; -import org.openapitools.virtualan.model.FileSchemaTestClass; import org.openapitools.virtualan.model.ModelApiResponse; -import org.openapitools.virtualan.model.OuterComposite; +import org.openapitools.virtualan.model.FileSchemaTestClass; +import java.time.LocalDate; +import java.util.Map; import org.openapitools.virtualan.model.User; +import org.openapitools.virtualan.model.OuterComposite; import org.openapitools.virtualan.model.XmlItem; +import org.openapitools.virtualan.model.Client; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import io.virtualan.annotation.ApiVirtual; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java index 2d8915631e39..927be38e8a32 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java @@ -6,8 +6,8 @@ package org.openapitools.virtualan.api; import java.util.Set; -import org.openapitools.virtualan.model.ModelApiResponse; import org.openapitools.virtualan.model.Pet; +import org.openapitools.virtualan.model.ModelApiResponse; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import io.virtualan.annotation.ApiVirtual; 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 1bc992a2d1d6..0737c362f42c 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 @@ -6,15 +6,15 @@ package org.openapitools.api; import java.math.BigDecimal; -import java.time.LocalDate; +import org.openapitools.model.XmlItem; import java.time.OffsetDateTime; +import java.time.LocalDate; import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.ModelApiResponse; -import org.openapitools.model.OuterComposite; import org.openapitools.model.User; -import org.openapitools.model.XmlItem; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.ModelApiResponse; import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index e135ad2702c0..ced42fd53068 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import java.util.Map; import org.openapitools.model.Order; +import java.util.Map; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; From 51b911c2f92cca7889d43a98328d49e0b8d57238 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Fri, 10 Jul 2020 20:27:05 +0200 Subject: [PATCH 11/33] typo --- .../org/openapitools/codegen/DefaultGenerator.java | 2 +- .../petstore/cpp-restsdk/client/api/PetApi.h | 4 ++-- .../petstore/cpp-restsdk/client/api/StoreApi.h | 2 +- .../petstore/cpp-restsdk/client/api/UserApi.h | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 4 ++-- .../org/openapitools/client/api/FakeApiImpl.java | 4 ++-- .../openapitools/client/api/rxjava/FakeApi.java | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 6 +++--- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../petstore/javascript-es6/src/api/FakeApi.js | 6 +++--- .../javascript-promise-es6/src/api/FakeApi.js | 6 +++--- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../client/petstore/lua/petstore/api/pet_api.lua | 2 +- .../client/petstore/nim/petstore/apis/api_pet.nim | 2 +- .../scala/org/openapitools/client/api/PetApi.scala | 2 +- .../scala/org/openapitools/client/api/PetApi.scala | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../api/another/level/pet-api.ts | 4 ++-- .../java/org/openapitools/client/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/client/api/PetApi.java | 2 +- .../server/src/handlers/OAIPetApiHandler.h | 4 ++-- .../server/src/requests/OAIPetApiRequest.h | 4 ++-- .../src/gen/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../java/org/openapitools/api/FakeApiService.java | 12 ++++++------ .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 12 ++++++------ .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../com/puppies/store/apis/PetApiController.java | 2 +- .../puppies/store/apis/PetApiControllerImp.java | 2 +- .../store/apis/PetApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/FakeApiController.java | 10 +++++----- .../app/controllers/FakeApiControllerImp.java | 10 +++++----- .../controllers/FakeApiControllerImpInterface.java | 10 +++++----- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiControllerImp.java | 2 +- .../controllers/PetApiControllerImpInterface.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 14 +++++++------- .../java/org/openapitools/api/FakeApiService.java | 14 +++++++------- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 14 +++++++------- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../java/org/openapitools/api/FakeApiService.java | 12 ++++++------ .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 12 ++++++------ .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 14 +++++++------- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 14 +++++++------- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/api/FakeApiService.java | 10 +++++----- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 10 +++++----- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../java/org/openapitools/api/FakeApiService.java | 12 ++++++------ .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 12 ++++++------ .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../java/org/openapitools/api/FakeApiService.java | 10 +++++----- .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 10 +++++----- .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../src/gen/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../java/org/openapitools/api/FakeApiService.java | 12 ++++++------ .../src/gen/java/org/openapitools/api/PetApi.java | 4 ++-- .../java/org/openapitools/api/PetApiService.java | 4 ++-- .../gen/java/org/openapitools/api/StoreApi.java | 2 +- .../java/org/openapitools/api/StoreApiService.java | 2 +- .../openapitools/api/impl/FakeApiServiceImpl.java | 12 ++++++------ .../openapitools/api/impl/PetApiServiceImpl.java | 4 ++-- .../openapitools/api/impl/StoreApiServiceImpl.java | 2 +- .../SymfonyBundle-php/Api/PetApiInterface.php | 2 +- .../SymfonyBundle-php/Controller/PetController.php | 2 +- .../openapi_server/controllers/pet_controller.py | 2 +- .../openapi_server/controllers/pet_controller.py | 2 +- .../openapi_server/controllers/pet_controller.py | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../org/openapitools/api/FakeApiController.java | 10 +++++----- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../org/openapitools/api/PetApiController.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiController.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../org/openapitools/api/FakeApiController.java | 10 +++++----- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../org/openapitools/api/PetApiController.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiController.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../java/org/openapitools/api/FakeApiDelegate.java | 12 ++++++------ .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/PetApiDelegate.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiDelegate.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 10 +++++----- .../org/openapitools/api/FakeApiController.java | 10 +++++----- .../java/org/openapitools/api/FakeApiDelegate.java | 10 +++++----- .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../org/openapitools/api/PetApiController.java | 2 +- .../java/org/openapitools/api/PetApiDelegate.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiController.java | 2 +- .../org/openapitools/api/StoreApiDelegate.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../java/org/openapitools/api/FakeApiDelegate.java | 12 ++++++------ .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../java/org/openapitools/api/PetApiDelegate.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/api/StoreApiDelegate.java | 2 +- .../main/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- .../org/openapitools/virtualan/api/FakeApi.java | 10 +++++----- .../org/openapitools/virtualan/api/PetApi.java | 4 ++-- .../main/java/org/openapitools/api/FakeApi.java | 12 ++++++------ .../src/main/java/org/openapitools/api/PetApi.java | 2 +- .../main/java/org/openapitools/api/StoreApi.java | 2 +- 262 files changed, 550 insertions(+), 550 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 18f7ada4a54a..1ca3c4d02a4a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -1126,7 +1126,7 @@ private List> toImportsObjects(Map mappedImpor @Override public int compare(final Map o1, final Map o2) { String s1 = o1.get("classname"); - String s2 = o1.get("classname"); + String s2 = o2.get("classname"); return s1.compareTo(s2); } }); diff --git a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h index 1e0d62e38b74..c4956f5eec17 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h @@ -21,10 +21,10 @@ #include "../ApiClient.h" +#include "ApiResponse.h" +#include "HttpContent.h" #include "Pet.h" #include -#include "HttpContent.h" -#include "ApiResponse.h" #include diff --git a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h index 63fb34622df0..f323827a0f8d 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h @@ -21,8 +21,8 @@ #include "../ApiClient.h" -#include #include "Order.h" +#include #include diff --git a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h index 27436bbf7745..04a0036b5fa8 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h @@ -21,9 +21,9 @@ #include "../ApiClient.h" +#include "User.h" #include #include -#include "User.h" #include diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java index fb5192d45e2b..d1d0e6ed88e5 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java @@ -4,13 +4,13 @@ import org.openapitools.client.EncodingUtils; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java index e07c2af926e5..b954226800ac 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java @@ -3,10 +3,10 @@ import org.openapitools.client.ApiClient; import org.openapitools.client.EncodingUtils; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java index dfad8d56f1c6..e3e4d58cd192 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java @@ -3,13 +3,13 @@ import org.openapitools.client.ApiClient; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java index 0a0ec4730c87..2708fb956ada 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import com.fasterxml.jackson.core.type.TypeReference; import com.google.api.client.http.EmptyContent; diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java index d19e7c0bbb9e..159f6abace35 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/FakeApi.java @@ -21,13 +21,13 @@ import org.openapitools.client.Pair; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java index 6bd7ecd2377b..a95b34eeb0ea 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java @@ -20,10 +20,10 @@ import org.openapitools.client.model.*; import org.openapitools.client.Pair; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.util.ArrayList; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java index 9336de9d9333..170ca91a961f 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java @@ -9,13 +9,13 @@ import javax.ws.rs.core.GenericType; import java.math.BigDecimal; -import java.time.OffsetDateTime; -import java.time.LocalDate; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; +import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java index 5e115b7d0218..71fe54b109ea 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java @@ -8,10 +8,10 @@ import javax.ws.rs.core.GenericType; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java index 3c48c279ff82..33f6b0d2fe28 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java @@ -24,9 +24,9 @@ package org.openapitools.client.api; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.io.File; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java index a3330651c056..8f739343f3c9 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java @@ -17,13 +17,13 @@ import org.openapitools.client.Pair; import java.math.BigDecimal; -import java.time.OffsetDateTime; -import java.time.LocalDate; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; +import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java index 0673014831a8..6061337d5672 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java @@ -16,10 +16,10 @@ import org.openapitools.client.ApiException; import org.openapitools.client.Pair; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java index 37a30c416deb..31b6ea1b3b29 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java @@ -18,13 +18,13 @@ import org.openapitools.client.Pair; import java.math.BigDecimal; -import java.time.OffsetDateTime; -import java.time.LocalDate; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; +import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java index 481a8149d82d..78058c16ada1 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java @@ -17,10 +17,10 @@ import org.openapitools.client.ApiResponse; import org.openapitools.client.Pair; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java index 3d39888ffe2e..657e2dfd968b 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java @@ -28,13 +28,13 @@ import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.lang.reflect.Type; diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java index decfb61979b9..d8c91125157c 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java @@ -27,10 +27,10 @@ import java.io.IOException; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java index 3d39888ffe2e..657e2dfd968b 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -28,13 +28,13 @@ import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.lang.reflect.Type; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java index decfb61979b9..d8c91125157c 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java @@ -27,10 +27,10 @@ import java.io.IOException; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java index 75065e75f285..2eaac5a4f4e0 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -14,13 +14,13 @@ package org.openapitools.client.api; import java.math.BigDecimal; -import java.time.OffsetDateTime; -import java.time.LocalDate; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; +import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java index 4bd86ad6016b..fb3e63b07c93 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java @@ -13,10 +13,10 @@ package org.openapitools.client.api; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.Arrays; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java index 06ea289ede66..5049424b2d90 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java @@ -15,13 +15,13 @@ import com.google.gson.reflect.TypeToken; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java index 8290407226fd..600310a6f929 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java @@ -14,10 +14,10 @@ package org.openapitools.client.api; import com.google.gson.reflect.TypeToken; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.Arrays; diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java index 4df72b06a5ed..697b70fc85c2 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java @@ -8,13 +8,13 @@ import javax.ws.rs.core.GenericType; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java index 7139c28d6de7..841806758c00 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java @@ -7,10 +7,10 @@ import javax.ws.rs.core.GenericType; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java index 7d6f1db15326..e3fda6c1ee12 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java @@ -3,13 +3,13 @@ import org.openapitools.client.ApiClient; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java index a789c8a23fa3..eac8abdc3ccd 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.Collections; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java index 7d6f1db15326..e3fda6c1ee12 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java @@ -3,13 +3,13 @@ import org.openapitools.client.ApiClient; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java index a789c8a23fa3..eac8abdc3ccd 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.Collections; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java index 7c9b330658da..a9c8e3f16da0 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java @@ -12,13 +12,13 @@ import okhttp3.MultipartBody; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java index 58a21df55e47..40e2cded8f97 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java @@ -11,10 +11,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java index b9e5b5cb752c..dbaa2f6d1b76 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -10,13 +10,13 @@ import okhttp3.MultipartBody; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java index 56dbc56f5f43..937389711550 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java @@ -9,10 +9,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java index 898afdaec6ec..a2d7e57449e9 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -11,13 +11,13 @@ import okhttp3.MultipartBody; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java index 0ae965f9cde4..bffcdb107c5d 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java @@ -10,10 +10,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java index a8ee355bc642..983a776a3646 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java @@ -11,13 +11,13 @@ import okhttp3.MultipartBody; import java.math.BigDecimal; -import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; +import org.threeten.bp.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.ArrayList; diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java index 492b2626ce0e..9c3cdc37f7a2 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/PetApi.java @@ -10,10 +10,10 @@ import okhttp3.ResponseBody; import okhttp3.MultipartBody; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java index d64369a228d7..2a30781bdad8 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java @@ -3,10 +3,10 @@ import org.openapitools.client.ApiClient; import io.vertx.core.file.AsyncFile; import java.math.BigDecimal; -import java.time.OffsetDateTime; -import java.time.LocalDate; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; import org.openapitools.client.model.XmlItem; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java index db6d5f6c7459..6627a5efb3c8 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java @@ -2,10 +2,10 @@ import io.vertx.core.file.AsyncFile; import java.math.BigDecimal; -import java.time.OffsetDateTime; -import java.time.LocalDate; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; import org.openapitools.client.model.XmlItem; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java index 2d091ff47764..f3a3b9b131b2 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java @@ -2,10 +2,10 @@ import io.vertx.core.file.AsyncFile; import java.math.BigDecimal; -import java.time.OffsetDateTime; -import java.time.LocalDate; import org.openapitools.client.model.Client; import org.openapitools.client.model.FileSchemaTestClass; +import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; import org.openapitools.client.model.XmlItem; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java index 75edd95c8dcf..95108f72e5e1 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java @@ -3,13 +3,13 @@ import org.openapitools.client.ApiClient; import java.math.BigDecimal; -import java.time.OffsetDateTime; -import java.time.LocalDate; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; +import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; -import java.io.File; import org.openapitools.client.model.XmlItem; import java.util.HashMap; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java index e9301d51967b..3749fe40927c 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java @@ -2,10 +2,10 @@ import org.openapitools.client.ApiClient; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import java.io.File; import java.util.HashMap; import java.util.List; diff --git a/samples/client/petstore/javascript-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-es6/src/api/FakeApi.js index ee2757ad8696..bfb8488e1bdb 100644 --- a/samples/client/petstore/javascript-es6/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-es6/src/api/FakeApi.js @@ -13,12 +13,12 @@ import ApiClient from "../ApiClient"; -import OuterComposite from '../model/OuterComposite'; -import HealthCheckResult from '../model/HealthCheckResult'; -import User from '../model/User'; import Client from '../model/Client'; import FileSchemaTestClass from '../model/FileSchemaTestClass'; +import HealthCheckResult from '../model/HealthCheckResult'; +import OuterComposite from '../model/OuterComposite'; import Pet from '../model/Pet'; +import User from '../model/User'; /** * Fake service. diff --git a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js index 662e53e96c61..60668b32a9af 100644 --- a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js @@ -13,12 +13,12 @@ import ApiClient from "../ApiClient"; -import OuterComposite from '../model/OuterComposite'; -import HealthCheckResult from '../model/HealthCheckResult'; -import User from '../model/User'; import Client from '../model/Client'; import FileSchemaTestClass from '../model/FileSchemaTestClass'; +import HealthCheckResult from '../model/HealthCheckResult'; +import OuterComposite from '../model/OuterComposite'; import Pet from '../model/Pet'; +import User from '../model/User'; /** * Fake service. diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0cf64291d804..60f72b51af95 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0cf64291d804..60f72b51af95 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index e7afb5f3424e..584c6ef06867 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index d7e18365d9d0..1cff24913d64 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0cf64291d804..60f72b51af95 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt index b9816034a981..e164a6cf4d06 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.* import io.ktor.client.request.forms.formData diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 4f5d1ed15d4d..5e930e963956 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0d8d2a061477..4b9faa2a2c46 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0cf64291d804..60f72b51af95 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 3add84ff4a24..f3f9c057d241 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -5,8 +5,8 @@ import retrofit2.http.* import retrofit2.Call import okhttp3.RequestBody -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet interface PetApi { /** diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 3c740a3c6e7b..c95dd04f915e 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0cf64291d804..60f72b51af95 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 0cf64291d804..60f72b51af95 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -11,8 +11,8 @@ */ package org.openapitools.client.apis -import org.openapitools.client.models.Pet import org.openapitools.client.models.ApiResponse +import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException diff --git a/samples/client/petstore/lua/petstore/api/pet_api.lua b/samples/client/petstore/lua/petstore/api/pet_api.lua index 4c018ad70699..02e0392c3e26 100644 --- a/samples/client/petstore/lua/petstore/api/pet_api.lua +++ b/samples/client/petstore/lua/petstore/api/pet_api.lua @@ -16,8 +16,8 @@ local dkjson = require "dkjson" local basexx = require "basexx" -- model import -local petstore_pet = require "petstore.model.pet" local petstore_api_response = require "petstore.model.api_response" +local petstore_pet = require "petstore.model.pet" local pet_api = {} local pet_api_mt = { diff --git a/samples/client/petstore/nim/petstore/apis/api_pet.nim b/samples/client/petstore/nim/petstore/apis/api_pet.nim index 5bed84c0290e..9858c523647e 100644 --- a/samples/client/petstore/nim/petstore/apis/api_pet.nim +++ b/samples/client/petstore/nim/petstore/apis/api_pet.nim @@ -18,8 +18,8 @@ import tables import typetraits import uri -import ../models/model_pet import ../models/model_api_response +import ../models/model_pet const basepath = "http://petstore.swagger.io/v2" diff --git a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala index 83fd02239fef..c0ba5d4c6ae2 100644 --- a/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala +++ b/samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala @@ -11,9 +11,9 @@ */ package org.openapitools.client.api +import org.openapitools.client.model.ApiResponse import java.io.File import org.openapitools.client.model.Pet -import org.openapitools.client.model.ApiResponse import org.openapitools.client.core._ import org.openapitools.client.core.CollectionFormats._ import org.openapitools.client.core.ApiKeyLocations._ diff --git a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala index ba5d29519a76..034cceb63cc7 100644 --- a/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala +++ b/samples/client/petstore/scala-sttp/src/main/scala/org/openapitools/client/api/PetApi.scala @@ -11,9 +11,9 @@ */ package org.openapitools.client.api +import org.openapitools.client.model.ApiResponse import java.io.File import org.openapitools.client.model.Pet -import org.openapitools.client.model.ApiResponse import org.openapitools.client.core.JsonSupport._ import sttp.client._ import sttp.model.Method diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index 7f31865a428d..2a6251140f4d 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index dc4be5d4716a..75e8d381d799 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index 1aebeb1ae5b6..e47b3272c439 100644 --- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts index 1c9c70d786c3..688c880a0feb 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts @@ -20,9 +20,9 @@ import { Configuration } from '../../../configuration'; // @ts-ignore import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../../../base'; // @ts-ignore -import { Pet } from '../../../model/some/levels/deep'; -// @ts-ignore import { ApiResponse } from '../../../model/some/levels/deep'; +// @ts-ignore +import { Pet } from '../../../model/some/levels/deep'; /** * PetApi - axios parameter creator * @export diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java index b0120750b5c0..b8893ee704f7 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java @@ -9,15 +9,15 @@ import javax.ws.rs.core.GenericType; import java.math.BigDecimal; -import java.time.OffsetDateTime; -import java.time.LocalDate; -import org.openapitools.client.model.HealthCheckResult; import org.openapitools.client.model.Client; +import java.io.File; import org.openapitools.client.model.FileSchemaTestClass; -import org.openapitools.client.model.OuterEnum; +import org.openapitools.client.model.HealthCheckResult; +import java.time.LocalDate; +import java.time.OffsetDateTime; import org.openapitools.client.model.OuterComposite; +import org.openapitools.client.model.OuterEnum; import org.openapitools.client.model.User; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java index f92185d4296b..3637b9e61a5a 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java @@ -8,9 +8,9 @@ import javax.ws.rs.core.GenericType; +import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h index c639fac6e944..4bc371414335 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h @@ -14,10 +14,10 @@ #include -#include "OAIPet.h" +#include "OAIApiResponse.h" #include "OAIHttpFileElement.h" +#include "OAIPet.h" #include -#include "OAIApiResponse.h" namespace OpenAPI { diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h index 872ef81a6e96..70b650ffb6ca 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h @@ -19,10 +19,10 @@ #include #include -#include "OAIPet.h" +#include "OAIApiResponse.h" #include "OAIHttpFileElement.h" +#include "OAIPet.h" #include -#include "OAIApiResponse.h" #include "OAIPetApiHandler.h" namespace OpenAPI { 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 dd6457f95a08..1fd809f2be82 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 @@ -8,15 +8,15 @@ import io.swagger.jaxrs.*; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; 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 5c8e94505121..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 @@ -7,15 +7,15 @@ import org.wso2.msf4j.formparam.FileInfo; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java index 6a31ff87c4cd..ea62e1388617 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java index 365a69fffccd..8c72b4fb3755 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java @@ -6,10 +6,10 @@ import org.wso2.msf4j.formparam.FormDataParam; import org.wso2.msf4j.formparam.FileInfo; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java index c386dd5ffdb6..63dd05bf4d65 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java index af3f9c325523..0bcd337aa217 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/StoreApiService.java @@ -6,8 +6,8 @@ import org.wso2.msf4j.formparam.FormDataParam; import org.wso2.msf4j.formparam.FileInfo; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 3e15fc5acc3d..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 @@ -4,15 +4,15 @@ import org.openapitools.model.*; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 234f1f7d20be..75b9c0aa3c28 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 680f3d984b57..7c4535b1f100 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java index 8bc37f41a3a8..de24a005c34c 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java @@ -1,8 +1,8 @@ package com.puppies.store.apis; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java index e8a6ad87695a..6bc56487bee4 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java @@ -1,8 +1,8 @@ package com.puppies.store.apis; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImpInterface.java index 90a42bb008d2..39679e11f45c 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImpInterface.java @@ -1,8 +1,8 @@ package com.puppies.store.apis; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java index 1711cdc72131..3b2126979674 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java index 6afa65f9546b..679dbe248542 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImpInterface.java index 78343c6b5674..7e4026b84cbf 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImpInterface.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java index b98ca61e7c9c..65c9c93ff75c 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; 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 e8f663725389..9869b1937d4b 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 @@ -2,14 +2,14 @@ import java.math.BigDecimal; import apimodels.Client; -import java.time.OffsetDateTime; -import apimodels.XmlItem; +import apimodels.FileSchemaTestClass; +import java.io.InputStream; import java.time.LocalDate; import java.util.Map; -import apimodels.User; +import java.time.OffsetDateTime; import apimodels.OuterComposite; -import apimodels.FileSchemaTestClass; -import java.io.InputStream; +import apimodels.User; +import apimodels.XmlItem; import play.mvc.Controller; import play.mvc.Result; 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 f184b499b929..236eaf1956fc 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 @@ -2,14 +2,14 @@ import java.math.BigDecimal; import apimodels.Client; -import java.time.OffsetDateTime; -import apimodels.XmlItem; +import apimodels.FileSchemaTestClass; +import java.io.InputStream; import java.time.LocalDate; import java.util.Map; -import apimodels.User; +import java.time.OffsetDateTime; import apimodels.OuterComposite; -import apimodels.FileSchemaTestClass; -import java.io.InputStream; +import apimodels.User; +import apimodels.XmlItem; import play.mvc.Http; import java.util.List; 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 a7bea418492c..3363805d153c 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 @@ -2,14 +2,14 @@ import java.math.BigDecimal; import apimodels.Client; -import java.time.OffsetDateTime; -import apimodels.XmlItem; +import apimodels.FileSchemaTestClass; +import java.io.InputStream; import java.time.LocalDate; import java.util.Map; -import apimodels.User; +import java.time.OffsetDateTime; import apimodels.OuterComposite; -import apimodels.FileSchemaTestClass; -import java.io.InputStream; +import apimodels.User; +import apimodels.XmlItem; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java index 8597930c5e50..3f06e26439a0 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java @@ -1,9 +1,9 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; import java.util.Set; -import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java index 6b74f7452d47..42cbef67a5f7 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java @@ -1,9 +1,9 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; import java.util.Set; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java index 03bf9419d5e0..77a658334b2d 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java @@ -1,9 +1,9 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; import java.util.Set; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java index 70c4028ce10b..9e387633d160 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java index a46d67cc612c..abd47c905137 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImpInterface.java index 0367f2856f65..144362644aff 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImpInterface.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java index 0395983d69d4..5e02b35ec983 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java index 05e2595dee10..49b9ea1ada7a 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImpInterface.java index 24bafa188742..6efc073d0f28 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImpInterface.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java index 472ded89bb77..3ffea9428ba3 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java index 985c152baece..0269dfb9877a 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java index 218be9a9c1ab..633a23ba5892 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java index 12a1271c2953..591c99e164a2 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImpInterface.java index d7e6f3e41732..307c6c18cfb9 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImpInterface.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java index 8883aeba8e1c..dbfc7e755040 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java index 12a1271c2953..591c99e164a2 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImpInterface.java index d7e6f3e41732..307c6c18cfb9 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImpInterface.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java index 218be9a9c1ab..633a23ba5892 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Controller; import play.mvc.Result; diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java index 12a1271c2953..591c99e164a2 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java index d7e6f3e41732..307c6c18cfb9 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java @@ -1,8 +1,8 @@ package controllers; +import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; -import java.io.InputStream; import play.mvc.Http; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java index e42d567086fc..c7b7d71de6e4 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java @@ -1,8 +1,8 @@ package org.openapitools.api; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java index abb3cca7fa39..9e7a74b714d4 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java index 4b22dceb8574..edc0727d90c3 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApi.java @@ -1,8 +1,8 @@ package org.openapitools.api; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import org.openapitools.api.PetApiService; import javax.ws.rs.*; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java index 51e88462a8ef..a6baa2c99775 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/PetApiService.java @@ -6,9 +6,9 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.Multipart; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java index d2b1ef792add..0bfebfdb536e 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import org.openapitools.api.StoreApiService; import javax.ws.rs.*; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java index 0c215fed7382..3135d74bb98e 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/StoreApiService.java @@ -6,8 +6,8 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.Multipart; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index d7a0becfec7c..f841e096bf51 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index f1c6b21d694c..50ea94a966cc 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -5,8 +5,8 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java index 050d2f1f0c8c..8bad72910f4b 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java @@ -1,8 +1,8 @@ package org.openapitools.api; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java index f2023aa2ef55..0fe7ed001bc8 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.io.InputStream; import java.io.OutputStream; 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 a9667ca950d6..ed1a63305793 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 @@ -1,15 +1,15 @@ package org.openapitools.api; -import org.joda.time.LocalDate; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; +import org.joda.time.LocalDate; +import java.util.Map; import org.openapitools.model.OuterComposite; -import java.io.File; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java index 0a47ecc2f6c8..51d9b79c80d1 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java @@ -1,9 +1,9 @@ package org.openapitools.api; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.io.InputStream; import java.io.OutputStream; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java index 09280258ad31..6cbc74824492 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.io.InputStream; import java.io.OutputStream; 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 a073c10cd244..a9fa5ad0eac3 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 @@ -8,16 +8,16 @@ import io.swagger.jaxrs.*; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; -import java.time.LocalDate; -import java.util.Map; import org.openapitools.model.Client; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.time.LocalDate; +import java.util.Map; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import java.time.OffsetDateTime; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.Map; import java.util.List; 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 60c132cd230b..1d56ff1af5c8 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 @@ -6,16 +6,16 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; -import java.time.LocalDate; -import java.util.Map; import org.openapitools.model.Client; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.time.LocalDate; +import java.util.Map; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import java.time.OffsetDateTime; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java index 806e2c3deffa..f426e3d49b9b 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java index 334f372eddfe..1f44eee7c800 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java index 10b9944705df..eb37ae7f4e61 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java index bb0bf81d730b..885579d9f0f2 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 4fc0ced7b9e7..f5ed05e48d0c 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 @@ -4,16 +4,16 @@ import org.openapitools.model.*; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; -import java.time.LocalDate; -import java.util.Map; import org.openapitools.model.Client; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.time.LocalDate; +import java.util.Map; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import java.time.OffsetDateTime; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index aae7e4cc707c..8e3cf747147a 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index c9350ef90764..1e67037417eb 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 065c05514b53..682b89705896 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 @@ -8,16 +8,16 @@ import io.swagger.jaxrs.*; import java.math.BigDecimal; +import org.openapitools.model.Client; import java.util.Date; +import java.io.File; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.HealthCheckResult; -import org.openapitools.model.Pet; import java.util.Map; -import org.openapitools.model.Client; -import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.Pet; +import org.openapitools.model.User; import java.util.Map; import java.util.List; 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 a609af9c3842..2c42464c17cb 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 @@ -6,16 +6,16 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import java.math.BigDecimal; +import org.openapitools.model.Client; import java.util.Date; +import java.io.File; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.HealthCheckResult; -import org.openapitools.model.Pet; import java.util.Map; -import org.openapitools.model.Client; -import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.Pet; +import org.openapitools.model.User; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java index e647cd46b367..2049e604b87d 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java @@ -7,9 +7,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java index 58f687f9ac0f..9271117c1c77 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,9 +5,9 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java index 6df25c0e9846..54a5de5fc1c7 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java index b6103464536d..db5973e5e18d 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 4793964a32dc..eb5903498e58 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 @@ -4,16 +4,16 @@ import org.openapitools.model.*; import java.math.BigDecimal; +import org.openapitools.model.Client; import java.util.Date; +import java.io.File; +import org.openapitools.model.FileSchemaTestClass; import org.openapitools.model.HealthCheckResult; -import org.openapitools.model.Pet; import java.util.Map; -import org.openapitools.model.Client; -import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.Pet; +import org.openapitools.model.User; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index a1a5e2d3e9ab..fc29b062439b 100644 --- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,9 +3,9 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 812afff4f939..ea00608349fb 100644 --- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java index a97fcb32891f..327b00e46c73 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApi.java @@ -6,9 +6,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java index dccc85aaf652..5415004bc635 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java index c67a244d7dbe..a79712327381 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApi.java @@ -6,8 +6,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java index a56abf7bf5a5..ed4c8338a600 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/StoreApiService.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 904864d5143d..0b264cc92ced 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 9553108dc08f..4669635c2590 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java index 3234ec661302..5b44c238acb1 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/PetApi.java @@ -5,9 +5,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java index a76b74bf330e..8408fb1d4c97 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 7aad23e3d410..50a3d2f99c38 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 371e223ca7f5..262a0fb0005a 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java index 3234ec661302..5b44c238acb1 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/PetApi.java @@ -5,9 +5,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java index a76b74bf330e..8408fb1d4c97 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 7aad23e3d410..50a3d2f99c38 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 371e223ca7f5..262a0fb0005a 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java index 3234ec661302..5b44c238acb1 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/PetApi.java @@ -5,9 +5,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java index a76b74bf330e..8408fb1d4c97 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import java.util.Map; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 7aad23e3d410..50a3d2f99c38 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 371e223ca7f5..262a0fb0005a 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java index a97fcb32891f..327b00e46c73 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApi.java @@ -6,9 +6,9 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java index dccc85aaf652..5415004bc635 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java index c67a244d7dbe..a79712327381 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApi.java @@ -6,8 +6,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java index a56abf7bf5a5..ed4c8338a600 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/StoreApiService.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 904864d5143d..0b264cc92ced 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,9 +5,9 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; -import org.openapitools.model.Pet; -import org.openapitools.model.ModelApiResponse; import java.io.File; +import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.Pet; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 9553108dc08f..4669635c2590 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -4,8 +4,8 @@ import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 e4aaafa06e06..5d3a13c41698 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 @@ -1,16 +1,16 @@ package org.openapitools.api; -import org.joda.time.LocalDate; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import org.joda.time.LocalDate; +import java.util.Map; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java index d639612b5be6..f9db4accd552 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java @@ -1,9 +1,9 @@ package org.openapitools.api; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java index c67a2a777e65..b40ba06efdef 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import javax.ws.rs.*; import javax.ws.rs.core.Response; 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 70fc5611978c..1f3b533006c8 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 @@ -1,16 +1,16 @@ package org.openapitools.api; -import org.joda.time.LocalDate; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import org.joda.time.LocalDate; +import java.util.Map; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java index c15aeb1203bb..ecd628c648ac 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java @@ -1,9 +1,9 @@ package org.openapitools.api; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import javax.ws.rs.*; import javax.ws.rs.core.Response; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java index 93562fb4e975..c55cdddea894 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import javax.ws.rs.*; import javax.ws.rs.core.Response; 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 8b85d11da16a..61ee91251643 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 @@ -8,14 +8,14 @@ import io.swagger.jaxrs.*; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; +import java.util.Map; import org.openapitools.model.OuterComposite; -import java.io.File; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.Map; import java.util.List; 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 d2fb8f1b63f7..8e38855afa7d 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 @@ -6,14 +6,14 @@ import com.sun.jersey.multipart.FormDataParam; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; +import java.util.Map; import org.openapitools.model.OuterComposite; -import java.io.File; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java index 4bd2a4215b02..1f3622c7a1d6 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java index 2a1caf54f2c2..f68ba1ccb376 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java index 4e0de650e718..aee703609307 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java index 81817d280bde..ff8059b1df2f 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 42064859d31f..64ce9b34b3a5 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 @@ -6,14 +6,14 @@ import com.sun.jersey.multipart.FormDataParam; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; +import java.util.Map; import org.openapitools.model.OuterComposite; -import java.io.File; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 9ec6e5ebb592..aa93e350cf01 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 384ad237be8a..8ec3bc61171e 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 6f0319642091..188218d7f8ce 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 @@ -8,15 +8,15 @@ import io.swagger.jaxrs.*; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.Map; import java.util.List; 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 595b5ce2a289..a6ac294ff429 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 @@ -6,15 +6,15 @@ import com.sun.jersey.multipart.FormDataParam; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java index c0362bd92cf9..0b5a6256e57c 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java index 8261ce51a081..c1e3d168cce9 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java index 1bfd16fcfa2c..8b264671b46e 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java index 81817d280bde..ff8059b1df2f 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 e053e9efce2d..39ad737f4e8a 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 @@ -6,15 +6,15 @@ import com.sun.jersey.multipart.FormDataParam; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index a66ae6a59076..8c6ed665c94b 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -5,10 +5,10 @@ import com.sun.jersey.multipart.FormDataParam; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index 384ad237be8a..8ec3bc61171e 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -5,8 +5,8 @@ import com.sun.jersey.multipart.FormDataParam; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 f72490e0043b..1c33d651b21e 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 @@ -8,14 +8,14 @@ import io.swagger.jaxrs.*; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; +import java.util.Map; import org.openapitools.model.OuterComposite; -import java.io.File; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.Map; import java.util.List; 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 0d11e2da81eb..04525b1f5df3 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 @@ -6,14 +6,14 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; +import java.util.Map; import org.openapitools.model.OuterComposite; -import java.io.File; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java index 51f6d340e8e7..a046d7cfa9e4 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java index 1612dd57126c..c1479cf71905 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java index 371620a33c0c..99c5047915d0 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java index bb0bf81d730b..885579d9f0f2 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 a8d4193e0650..a0aab5f5ddfb 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 @@ -4,14 +4,14 @@ import org.openapitools.model.*; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; +import java.util.Map; import org.openapitools.model.OuterComposite; -import java.io.File; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index b7769ef248b0..0d819b4333a0 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index c9350ef90764..1e67037417eb 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 44f5a0a6d09c..dbac80bce28b 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 @@ -8,15 +8,15 @@ import io.swagger.jaxrs.*; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.Map; import java.util.List; 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 d3217fa9fddf..ef99e405ede4 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 @@ -6,15 +6,15 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java index 806e2c3deffa..f426e3d49b9b 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java @@ -7,10 +7,10 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java index 334f372eddfe..1f44eee7c800 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java @@ -5,10 +5,10 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java index 10b9944705df..eb37ae7f4e61 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java @@ -7,8 +7,8 @@ import io.swagger.annotations.ApiParam; import io.swagger.jaxrs.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.Map; import java.util.List; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java index bb0bf81d730b..885579d9f0f2 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java @@ -5,8 +5,8 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; 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 c8e8df3b0929..e7e51e70e841 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 @@ -4,15 +4,15 @@ import org.openapitools.model.*; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Date; -import java.util.Map; import org.openapitools.model.Client; +import java.util.Date; +import java.io.File; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; -import java.io.File; +import org.openapitools.model.OuterComposite; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index aae7e4cc707c..8e3cf747147a 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -3,10 +3,10 @@ import org.openapitools.api.*; import org.openapitools.model.*; +import java.io.File; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -import org.openapitools.model.ModelApiResponse; -import java.io.File; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java index c9350ef90764..1e67037417eb 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java @@ -3,8 +3,8 @@ import org.openapitools.api.*; import org.openapitools.model.*; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import java.util.List; import org.openapitools.api.NotFoundException; diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php index b9403e739b47..0cf1ef82a85d 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php @@ -29,8 +29,8 @@ namespace OpenAPI\Server\Api; use Symfony\Component\HttpFoundation\File\UploadedFile; -use OpenAPI\Server\Model\Pet; use OpenAPI\Server\Model\ApiResponse; +use OpenAPI\Server\Model\Pet; /** * PetApiInterface Interface Doc Comment diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php index 155e658e442e..ba7ecc50c5c8 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php @@ -36,8 +36,8 @@ use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\Validator\Constraints as Assert; use OpenAPI\Server\Api\PetApiInterface; -use OpenAPI\Server\Model\Pet; use OpenAPI\Server\Model\ApiResponse; +use OpenAPI\Server\Model\Pet; /** * PetController Class Doc Comment diff --git a/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py b/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py index 920b874d94d1..ad7557832bab 100644 --- a/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py +++ b/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/controllers/pet_controller.py @@ -1,8 +1,8 @@ from typing import List, Dict from aiohttp import web -from openapi_server.models.pet import Pet from openapi_server.models.api_response import ApiResponse +from openapi_server.models.pet import Pet from openapi_server import util diff --git a/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py b/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py index 920b874d94d1..ad7557832bab 100644 --- a/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py +++ b/samples/server/petstore/python-aiohttp/openapi_server/controllers/pet_controller.py @@ -1,8 +1,8 @@ from typing import List, Dict from aiohttp import web -from openapi_server.models.pet import Pet from openapi_server.models.api_response import ApiResponse +from openapi_server.models.pet import Pet from openapi_server import util diff --git a/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py b/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py index 9fc53652c37b..17699957ddd3 100644 --- a/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py +++ b/samples/server/petstore/python-flask/openapi_server/controllers/pet_controller.py @@ -1,8 +1,8 @@ import connexion import six -from openapi_server.models.pet import Pet # noqa: E501 from openapi_server.models.api_response import ApiResponse # noqa: E501 +from openapi_server.models.pet import Pet # noqa: E501 from openapi_server import util 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 931e2a5c7b02..25c244ded220 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; -import java.time.LocalDate; -import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.time.LocalDate; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import java.time.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java index c66e74e11ed9..6883dcacee84 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java index 92ab0920b231..ea131aed2712 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 0f9d86d67584..779131b34af8 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.LocalDate; -import java.util.Map; import org.openapitools.model.Client; -import java.time.LocalDateTime; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java index b97b84b2decd..23311c253bbd 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java index ced42fd53068..e135ad2702c0 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 8c654484aabf..364b70eb9fd4 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Map; import org.openapitools.model.Client; -import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import org.threeten.bp.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java index 40317a694636..68f42954ab3b 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Map; import org.openapitools.model.Client; -import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import org.threeten.bp.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java index eff7de581e7c..0c13bf4b97de 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java index 36ade80d2a14..ac991356a7a6 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java index 71196c412f77..fe89b207bfee 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java index 65d283fbe5ed..b03098aa747f 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApiController.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 8c654484aabf..364b70eb9fd4 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Map; import org.openapitools.model.Client; -import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import org.threeten.bp.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java index 0b805ec72dff..75f81592a13b 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Map; import org.openapitools.model.Client; -import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import org.threeten.bp.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java index eff7de581e7c..0c13bf4b97de 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java index a02a4b4ae432..6621ae38e156 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index 71196c412f77..fe89b207bfee 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java index e03e7db060b8..1a02c0b756d1 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApiController.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 24c011750f6a..6be604287145 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; -import java.time.LocalDate; -import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.time.LocalDate; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import java.time.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; 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 b9d5bf504efd..48f9c6a1ae63 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 @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; -import java.time.LocalDate; -import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.time.LocalDate; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import java.time.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java index 7a41bd9c8489..fd05628030b4 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java index d2f27d568a0e..5a70de5ef3e6 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index d9628f3f0881..17d14a277fb0 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java index e203a274c533..5091e7e1f2cc 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 8c654484aabf..364b70eb9fd4 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Map; import org.openapitools.model.Client; -import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import org.threeten.bp.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java index 3090481a14c3..d61d01c66ba6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Map; import org.openapitools.model.Client; -import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import org.threeten.bp.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 497d91a58367..c28f5b8e99fb 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 @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.util.Map; import org.openapitools.model.Client; -import org.threeten.bp.OffsetDateTime; import org.openapitools.model.FileSchemaTestClass; import org.threeten.bp.LocalDate; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import org.threeten.bp.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index eff7de581e7c..0c13bf4b97de 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java index ed8bd9223381..4a8a378932dc 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java index b65110d5fb1e..426aeb269488 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 71196c412f77..fe89b207bfee 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java index 7e9c6fcdf290..ad6c539471b0 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiController.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java index b6c6bd2479d1..a7bfc60e1289 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; 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 b07045866c39..b1cd89769a8d 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; -import java.time.LocalDate; -import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.time.LocalDate; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import java.time.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index ba27bd7548ed..05b6668260fd 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index a0ca400938c4..7ee3a40eb744 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 38b61255e044..203c4720538e 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; -import java.time.LocalDate; -import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.time.LocalDate; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import java.time.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; 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 a7152a1c49f4..e3bf18868356 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 @@ -1,16 +1,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; -import java.time.LocalDate; -import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.time.LocalDate; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import java.time.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java index 24678be69419..1eb822dea268 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java index b961079ce65f..f8c2b92e9989 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -1,9 +1,9 @@ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index 2f9ac5da521a..68b06d86791b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java index bd3885549461..37457faadcd1 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -1,7 +1,7 @@ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 001fb57173b8..b0855540d130 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; -import java.time.LocalDate; -import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.time.LocalDate; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import java.time.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java index 399de7a71922..53c4221aacd1 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index ced42fd53068..e135ad2702c0 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; 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 d4b4277e0271..c02b842be9bb 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 @@ -6,16 +6,16 @@ package org.openapitools.virtualan.api; import java.math.BigDecimal; -import java.time.OffsetDateTime; -import org.openapitools.virtualan.model.ModelApiResponse; +import org.openapitools.virtualan.model.Client; import org.openapitools.virtualan.model.FileSchemaTestClass; import java.time.LocalDate; import java.util.Map; -import org.openapitools.virtualan.model.User; +import org.openapitools.virtualan.model.ModelApiResponse; +import java.time.OffsetDateTime; import org.openapitools.virtualan.model.OuterComposite; -import org.openapitools.virtualan.model.XmlItem; -import org.openapitools.virtualan.model.Client; import org.springframework.core.io.Resource; +import org.openapitools.virtualan.model.User; +import org.openapitools.virtualan.model.XmlItem; import io.swagger.annotations.*; import io.virtualan.annotation.ApiVirtual; import io.virtualan.annotation.VirtualService; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java index 927be38e8a32..fbe40637013a 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.virtualan.api; -import java.util.Set; -import org.openapitools.virtualan.model.Pet; import org.openapitools.virtualan.model.ModelApiResponse; +import org.openapitools.virtualan.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import io.virtualan.annotation.ApiVirtual; import io.virtualan.annotation.VirtualService; 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 0737c362f42c..637dabcf2d2e 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 @@ -6,16 +6,16 @@ package org.openapitools.api; import java.math.BigDecimal; -import org.openapitools.model.XmlItem; -import java.time.OffsetDateTime; -import java.time.LocalDate; -import java.util.Map; import org.openapitools.model.Client; import org.openapitools.model.FileSchemaTestClass; -import org.openapitools.model.User; -import org.openapitools.model.OuterComposite; +import java.time.LocalDate; +import java.util.Map; import org.openapitools.model.ModelApiResponse; +import java.time.OffsetDateTime; +import org.openapitools.model.OuterComposite; import org.springframework.core.io.Resource; +import org.openapitools.model.User; +import org.openapitools.model.XmlItem; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index b97b84b2decd..23311c253bbd 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -5,10 +5,10 @@ */ package org.openapitools.api; -import java.util.Set; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index ced42fd53068..e135ad2702c0 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -5,8 +5,8 @@ */ package org.openapitools.api; -import org.openapitools.model.Order; import java.util.Map; +import org.openapitools.model.Order; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; From c8f113980138222e98315402fd445c4eed606836 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Sat, 11 Jul 2020 13:47:11 +0200 Subject: [PATCH 12/33] add type previous imports are still there. --- .../typescript/SharedTypeScriptTest.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java index 75642244c053..968b6b2261bf 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java @@ -15,7 +15,7 @@ public class SharedTypeScriptTest { @Test - public void splitImport() throws IOException { + public void typesInImportsAreSplitted() throws IOException { CodegenConfigurator config = new CodegenConfigurator() .setInputSpec("split-import.json") @@ -46,4 +46,22 @@ private void checkAPIFile(List files, String apiFileName) throws IOExcepti Assert.assertEquals(StringUtils.countMatches(apiFileContent,"import { PersonWrapper }"),1); Assert.assertEquals(StringUtils.countMatches(apiFileContent,"import { OrganizationWrapper }"),1); } + + @Test + public void oldImportsStillThere() throws IOException { + CodegenConfigurator config = + new CodegenConfigurator() + .setInputSpec("petstore.json") + .setModelPackage("model") + .setApiPackage("api") + .addAdditionalProperty( + TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); + + config.setGeneratorName("typescript-angular"); + final List files = getGenerator(config).generate(); + File pets = files.stream().filter(file->file.getName().contains("pet.ts")).findFirst().get(); + String apiFileContent = FileUtils.readFileToString(pets); + Assert.assertTrue(apiFileContent.contains("import { Category }")); + Assert.assertTrue(apiFileContent.contains("import { Tag }")); + } } From eec9818bd107618ee07daae8c2cec696a6f18979 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Sun, 12 Jul 2020 13:23:58 +0200 Subject: [PATCH 13/33] add type previous imports are still there. --- .../TypeScriptAngularClientCodegen.java | 37 +++++++++++++++++++ .../builds/default/model/pet.ts | 2 + .../builds/with-npm/model/pet.ts | 2 + .../builds/default/model/pet.ts | 2 + .../builds/with-npm/model/pet.ts | 2 + .../builds/default/model/pet.ts | 2 + .../builds/with-npm/model/pet.ts | 2 + .../builds/default/model/pet.ts | 2 + .../builds/with-npm/model/pet.ts | 2 + .../single-request-parameter/model/pet.ts | 2 + .../builds/with-npm/model/pet.ts | 2 + .../with-prefixed-module-name/model/pet.ts | 2 + 12 files changed, 59 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index 6407c815c19c..16de6bf2e74b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -470,11 +470,48 @@ public Map postProcessAllModels(Map objs) { cm.imports.remove(cm.parent); } } + // Add additional filename information for imports + Set parsedImports = parseImports(cm); + mo.put("tsImports", toTsImports(cm, parsedImports)); } } return result; } + /** + * Parse imports + */ + private Set parseImports(CodegenModel cm) { + Set newImports = new HashSet(); + if (cm.imports.size() > 0) { + for (String name : cm.imports) { + if (name.indexOf(" | ") >= 0) { + String[] parts = name.split(" \\| "); + for (String s : parts) { + newImports.add(s); + } + } else { + newImports.add(name); + } + } + } + return newImports; + } + + private List> toTsImports(CodegenModel cm, Set imports) { + List> tsImports = new ArrayList<>(); + for (String im : imports) { + if (!im.equals(cm.classname)) { + HashMap tsImport = new HashMap<>(); + // TVG: This is used as class name in the import statements of the model file + tsImport.put("classname", im); + tsImport.put("filename", toModelFilename(removeModelPrefixSuffix(im))); + tsImports.add(tsImport); + } + } + return tsImports; + } + @Override public String toApiName(String name) { if (name.length() == 0) { diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/model/pet.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/model/pet.ts index 221e7b6ebdc4..e0404395f91c 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/model/pet.ts @@ -9,6 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { Category } from './category'; +import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/model/pet.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/model/pet.ts index 221e7b6ebdc4..e0404395f91c 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/model/pet.ts @@ -9,6 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { Category } from './category'; +import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/model/pet.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/model/pet.ts index 221e7b6ebdc4..e0404395f91c 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/model/pet.ts @@ -9,6 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { Category } from './category'; +import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/model/pet.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/model/pet.ts index 221e7b6ebdc4..e0404395f91c 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/model/pet.ts @@ -9,6 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { Category } from './category'; +import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/model/pet.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/model/pet.ts index 221e7b6ebdc4..e0404395f91c 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/model/pet.ts @@ -9,6 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { Category } from './category'; +import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/model/pet.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/model/pet.ts index fb143205d46f..96bf2cd3df45 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/model/pet.ts @@ -9,6 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { Category } from './category'; +import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/model/pet.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/model/pet.ts index 221e7b6ebdc4..e0404395f91c 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/model/pet.ts @@ -9,6 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { Category } from './category'; +import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/model/pet.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/model/pet.ts index 221e7b6ebdc4..e0404395f91c 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/model/pet.ts @@ -9,6 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { Category } from './category'; +import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/model/pet.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/model/pet.ts index 221e7b6ebdc4..e0404395f91c 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/model/pet.ts @@ -9,6 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { Category } from './category'; +import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/model/pet.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/model/pet.ts index 221e7b6ebdc4..e0404395f91c 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/model/pet.ts @@ -9,6 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { Category } from './category'; +import { Tag } from './tag'; /** diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/model/pet.ts b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/model/pet.ts index 221e7b6ebdc4..e0404395f91c 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/model/pet.ts +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/model/pet.ts @@ -9,6 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { Category } from './category'; +import { Tag } from './tag'; /** From e1c0882100679e912f2d730f9c8e7926125db402 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Mon, 20 Jul 2020 14:18:30 +0200 Subject: [PATCH 14/33] remove new test to see if they are the problem. --- .../codegen/typescript/SharedTypeScriptTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java index 968b6b2261bf..e411dc4ffd9e 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java @@ -24,14 +24,14 @@ public void typesInImportsAreSplitted() throws IOException { .addAdditionalProperty( TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); - config.setGeneratorName("typescript-axios"); - checkAPIFile(getGenerator(config).generate(), "default-api.ts"); - - config.setGeneratorName("typescript-node"); - checkAPIFile(getGenerator(config).generate(), "defaultApi.ts"); - - config.setGeneratorName("typescript-angular"); - checkAPIFile(getGenerator(config).generate(), "default.service.ts"); +// config.setGeneratorName("typescript-axios"); +// checkAPIFile(getGenerator(config).generate(), "default-api.ts"); +// +// config.setGeneratorName("typescript-node"); +// checkAPIFile(getGenerator(config).generate(), "defaultApi.ts"); +// +// config.setGeneratorName("typescript-angular"); +// checkAPIFile(getGenerator(config).generate(), "default.service.ts"); } From d75a96a84b0f9a66630c936c6701d2a92953709d Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Mon, 27 Jul 2020 09:33:33 +0200 Subject: [PATCH 15/33] merge master add tests back in --- .../codegen/typescript/SharedTypeScriptTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java index e411dc4ffd9e..968b6b2261bf 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java @@ -24,14 +24,14 @@ public void typesInImportsAreSplitted() throws IOException { .addAdditionalProperty( TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); -// config.setGeneratorName("typescript-axios"); -// checkAPIFile(getGenerator(config).generate(), "default-api.ts"); -// -// config.setGeneratorName("typescript-node"); -// checkAPIFile(getGenerator(config).generate(), "defaultApi.ts"); -// -// config.setGeneratorName("typescript-angular"); -// checkAPIFile(getGenerator(config).generate(), "default.service.ts"); + config.setGeneratorName("typescript-axios"); + checkAPIFile(getGenerator(config).generate(), "default-api.ts"); + + config.setGeneratorName("typescript-node"); + checkAPIFile(getGenerator(config).generate(), "defaultApi.ts"); + + config.setGeneratorName("typescript-angular"); + checkAPIFile(getGenerator(config).generate(), "default.service.ts"); } From f66c514cd619acf3f56b41dbfd35760bf670e588 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Mon, 27 Jul 2020 09:56:18 +0200 Subject: [PATCH 16/33] align changes which should not lead to failing test but you never know. --- .../codegen/languages/TypeScriptAxiosClientCodegen.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java index 09bc5d441dc0..95ded86dce5e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java @@ -26,6 +26,7 @@ import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.SupportingFile; import org.openapitools.codegen.meta.features.DocumentationFeature; +import org.openapitools.codegen.utils.ModelUtils; import java.util.*; @@ -133,6 +134,7 @@ public void processOpts() { @Override public Map postProcessOperationsWithModels(Map objs, List allModels) { + objs = super.postProcessOperationsWithModels(objs, allModels); Map vals = (Map) objs.getOrDefault("operations", new HashMap<>()); List operations = (List) vals.getOrDefault("operation", new ArrayList<>()); /* From a8ecd4e6b47cbf1ee1522ec9507c8ed1b069f79b Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Mon, 27 Jul 2020 10:16:56 +0200 Subject: [PATCH 17/33] remove formatting changes --- .../codegen/languages/TypeScriptAngularClientCodegen.java | 2 +- .../codegen/languages/TypeScriptNodeClientCodegen.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index 6b5455b19ee7..67dd8f7b3056 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -556,7 +556,7 @@ public String toModelImport(String name) { if (importMapping.containsKey(name)) { return importMapping.get(name); } - return modelPackage() + "/" + toModelFilename(name).substring(DEFAULT_IMPORT_PREFIX.length()); + return modelPackage() + "/" + toModelFilename(name).substring(DEFAULT_IMPORT_PREFIX.length()); } public String getNpmRepository() { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java index d2b613e5aaf7..09d5ae4df4e8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java @@ -161,6 +161,7 @@ public String toModelImport(String name) { if (importMapping.containsKey(name)) { return importMapping.get(name); } + return modelPackage() + "/" + camelize(toModelName(name), true); } From 460a0f57667b23026a0c6b831fe97a269bd635d6 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Mon, 27 Jul 2020 10:25:19 +0200 Subject: [PATCH 18/33] dummy change --- .../codegen/languages/TypeScriptAngularClientCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index 67dd8f7b3056..85d5bf1bc1c6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -339,7 +339,7 @@ public boolean getQueryParamObjectFormatKey() { @Override public boolean isDataTypeFile(final String dataType) { return dataType != null && dataType.equals("Blob"); - } + }//test @Override public String getTypeDeclaration(Schema p) { From f7a9516360682d0cb02580d88a17c675f52d505d Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Mon, 27 Jul 2020 10:28:55 +0200 Subject: [PATCH 19/33] revert spaces --- .../codegen/languages/TypeScriptAngularClientCodegen.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index 85d5bf1bc1c6..99de2483e0d5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -190,7 +190,7 @@ public void processOpts() { additionalProperties.put(PROVIDED_IN_ROOT, true); } else { additionalProperties.put(PROVIDED_IN_ROOT, Boolean.parseBoolean( - additionalProperties.get(PROVIDED_IN_ROOT).toString() + additionalProperties.get(PROVIDED_IN_ROOT).toString() )); } @@ -339,7 +339,7 @@ public boolean getQueryParamObjectFormatKey() { @Override public boolean isDataTypeFile(final String dataType) { return dataType != null && dataType.equals("Blob"); - }//test + } @Override public String getTypeDeclaration(Schema p) { @@ -696,4 +696,4 @@ private String convertUsingFileNamingConvention(String originalName) { return name; } -} +} \ No newline at end of file From 08042bf34a2b11e8201152f0fce592aaecfd2c50 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Mon, 27 Jul 2020 10:31:23 +0200 Subject: [PATCH 20/33] revert spaces --- .../languages/TypeScriptAngularClientCodegen.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index 99de2483e0d5..2ddd43eb04de 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -176,7 +176,7 @@ public void processOpts() { apiTemplateFiles.put("apiInterface.mustache", "Interface.ts"); } } - + if (additionalProperties.containsKey(USE_SINGLE_REQUEST_PARAMETER)) { this.setUseSingleRequestParameter(convertPropertyToBoolean(USE_SINGLE_REQUEST_PARAMETER)); } @@ -190,11 +190,11 @@ public void processOpts() { additionalProperties.put(PROVIDED_IN_ROOT, true); } else { additionalProperties.put(PROVIDED_IN_ROOT, Boolean.parseBoolean( - additionalProperties.get(PROVIDED_IN_ROOT).toString() + additionalProperties.get(PROVIDED_IN_ROOT).toString() )); } - if (ngVersion.atLeast("9.0.0")) { + if (ngVersion.atLeast("9.0.0")) { additionalProperties.put(ENFORCE_GENERIC_MODULE_WITH_PROVIDERS, true); } else { additionalProperties.put(ENFORCE_GENERIC_MODULE_WITH_PROVIDERS, false); @@ -340,7 +340,7 @@ public boolean getQueryParamObjectFormatKey() { public boolean isDataTypeFile(final String dataType) { return dataType != null && dataType.equals("Blob"); } - + @Override public String getTypeDeclaration(Schema p) { if (ModelUtils.isFileSchema(p)) { @@ -696,4 +696,4 @@ private String convertUsingFileNamingConvention(String originalName) { return name; } -} \ No newline at end of file +} From 246614b08393e5a79df685e17aa25993825ab960 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Tue, 28 Jul 2020 09:14:37 +0200 Subject: [PATCH 21/33] revert functional changes --- .../codegen/DefaultGenerator.java | 23 ++++++- .../AbstractTypeScriptClientCodegen.java | 60 +++++++++---------- 2 files changed, 51 insertions(+), 32 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 7fbffa50b621..95d48a86a60e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -1077,8 +1077,27 @@ private Map processOperations(CodegenConfig config, String tag, allImports.addAll(op.imports); } - Map mappings = getAllImportsMapppings(allImports); - List> imports = toImportsObjects(mappings); +// Map mappings = getAllImportsMapppings(allImports); +// List> imports = toImportsObjects(mappings); + + List> imports = new ArrayList<>(); + Set mappingSet = new TreeSet<>(); + for (String nextImport : allImports) { + Map im = new LinkedHashMap<>(); + String mapping = config.importMapping().get(nextImport); + if (mapping == null) { + mapping = config.toModelImport(nextImport); + } + + if (mapping != null && !mappingSet.contains(mapping)) { // ensure import (mapping) is unique + mappingSet.add(mapping); + im.put("import", mapping); + im.put("classname", nextImport); + if (!imports.contains(im)) { // avoid duplicates + imports.add(im); + } + } + } operations.put("imports", imports); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index 09754b26b7a6..273502c2a79d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -224,36 +224,36 @@ public void processOpts() { } } - @Override - public String toModelImport( String name){ - if(name.contains("|")){ - List names = Arrays.asList(name.split("\\|")); - LOGGER.warn("The import is a union type. Consider using the toModelImportMap method."); - return names.stream() - .map(withSpace->withSpace.replaceAll(" ","")) - .map(noSpace->super.toModelImport(noSpace)) - .collect(Collectors.joining("|")); - } - return super.toModelImport(name); - } - - /** - * Maps the fully qualified model import to the initial given name. In case of union types the map will have multiple entries. - * For example for "classA | classB" the map will two entries have ["model.classA","classA"] and ["model.classB","classB"]. - * - * @param name the name of the "Model" - * @return Map between the fully qualified model import and the initial given name. - */ - @Override - public Map toModelImportMap( String name){ - if(name.contains("|")){ - List names = Arrays.asList(name.replace(" ","").split("\\|")); - Map result = Maps.newHashMap(); - names.forEach(s->result.put(toModelImport(s),s)); - return result; - } - return Collections.singletonMap(toModelImport(name),name); - } +// @Override +// public String toModelImport( String name){ +// if(name.contains("|")){ +// List names = Arrays.asList(name.split("\\|")); +// LOGGER.warn("The import is a union type. Consider using the toModelImportMap method."); +// return names.stream() +// .map(withSpace->withSpace.replaceAll(" ","")) +// .map(noSpace->super.toModelImport(noSpace)) +// .collect(Collectors.joining("|")); +// } +// return super.toModelImport(name); +// } + +// /** +// * Maps the fully qualified model import to the initial given name. In case of union types the map will have multiple entries. +// * For example for "classA | classB" the map will two entries have ["model.classA","classA"] and ["model.classB","classB"]. +// * +// * @param name the name of the "Model" +// * @return Map between the fully qualified model import and the initial given name. +// */ +// @Override +// public Map toModelImportMap( String name){ +// if(name.contains("|")){ +// List names = Arrays.asList(name.replace(" ","").split("\\|")); +// Map result = Maps.newHashMap(); +// names.forEach(s->result.put(toModelImport(s),s)); +// return result; +// } +// return Collections.singletonMap(toModelImport(name),name); +// } @Override From 2bbd922a9080bc3f4efbb5b0ee54420c812fa582 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Tue, 28 Jul 2020 09:25:21 +0200 Subject: [PATCH 22/33] comment out test --- .../codegen/DefaultGenerator.java | 66 +++++++++---------- .../typescript/SharedTypeScriptTest.java | 32 ++++----- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 95d48a86a60e..000f7efac635 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -1118,39 +1118,39 @@ private Map processOperations(CodegenConfig config, String tag, return operations; } - private Map getAllImportsMapppings(Set allImports){ - Map result = new HashMap<>(); - allImports.forEach(nextImport->{ - String mapping = config.importMapping().get(nextImport); - if(mapping!= null){ - result.put(mapping,nextImport); - }else{ - result.putAll(config.toModelImportMap(nextImport)); - } - }); - return result; - } - - private List> toImportsObjects(Map mappedImports){ - List> result = new ArrayList<>(); - mappedImports.entrySet().forEach(mapping->{ - Map im = new LinkedHashMap<>(); - im.put("import", mapping.getKey()); - im.put("classname", mapping.getValue()); - if (!result.contains(im)) { // avoid duplicates - result.add(im); - } - }); - Collections.sort(result, new Comparator>() { - @Override - public int compare(final Map o1, final Map o2) { - String s1 = o1.get("classname"); - String s2 = o2.get("classname"); - return s1.compareTo(s2); - } - }); - return result; - } +// private Map getAllImportsMapppings(Set allImports){ +// Map result = new HashMap<>(); +// allImports.forEach(nextImport->{ +// String mapping = config.importMapping().get(nextImport); +// if(mapping!= null){ +// result.put(mapping,nextImport); +// }else{ +// result.putAll(config.toModelImportMap(nextImport)); +// } +// }); +// return result; +// } +// +// private List> toImportsObjects(Map mappedImports){ +// List> result = new ArrayList<>(); +// mappedImports.entrySet().forEach(mapping->{ +// Map im = new LinkedHashMap<>(); +// im.put("import", mapping.getKey()); +// im.put("classname", mapping.getValue()); +// if (!result.contains(im)) { // avoid duplicates +// result.add(im); +// } +// }); +// Collections.sort(result, new Comparator>() { +// @Override +// public int compare(final Map o1, final Map o2) { +// String s1 = o1.get("classname"); +// String s2 = o2.get("classname"); +// return s1.compareTo(s2); +// } +// }); +// return result; +// } private Map processModels(CodegenConfig config, Map definitions) { Map objs = new HashMap<>(); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java index 968b6b2261bf..570b8fb86cf6 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java @@ -16,22 +16,22 @@ public class SharedTypeScriptTest { @Test public void typesInImportsAreSplitted() throws IOException { - CodegenConfigurator config = - new CodegenConfigurator() - .setInputSpec("split-import.json") - .setModelPackage("model") - .setApiPackage("api") - .addAdditionalProperty( - TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); - - config.setGeneratorName("typescript-axios"); - checkAPIFile(getGenerator(config).generate(), "default-api.ts"); - - config.setGeneratorName("typescript-node"); - checkAPIFile(getGenerator(config).generate(), "defaultApi.ts"); - - config.setGeneratorName("typescript-angular"); - checkAPIFile(getGenerator(config).generate(), "default.service.ts"); +// CodegenConfigurator config = +// new CodegenConfigurator() +// .setInputSpec("split-import.json") +// .setModelPackage("model") +// .setApiPackage("api") +// .addAdditionalProperty( +// TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); +// +// config.setGeneratorName("typescript-axios"); +// checkAPIFile(getGenerator(config).generate(), "default-api.ts"); +// +// config.setGeneratorName("typescript-node"); +// checkAPIFile(getGenerator(config).generate(), "defaultApi.ts"); +// +// config.setGeneratorName("typescript-angular"); +// checkAPIFile(getGenerator(config).generate(), "default.service.ts"); } From 56eff35e14944e78a9a7ab0607f6e935ed8fc569 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Tue, 28 Jul 2020 11:01:33 +0200 Subject: [PATCH 23/33] remove model --- .../src/test/resources/split-import.json | 74 ------------------- 1 file changed, 74 deletions(-) delete mode 100644 modules/openapi-generator/src/test/resources/split-import.json diff --git a/modules/openapi-generator/src/test/resources/split-import.json b/modules/openapi-generator/src/test/resources/split-import.json deleted file mode 100644 index 736517af4635..000000000000 --- a/modules/openapi-generator/src/test/resources/split-import.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "openapi": "3.0.2", - "info": { - "title": "SAP Graph - Customers API", - "version": "0.1.0" - }, - "paths": { - "/Customer": { - "get": { - "operationId": "getCustomer", - "responses": { - "200": { - "$ref": "#/components/responses/CustomerResponse" - } - } - } - }, - "/Person": { - "get": { - "operationId": "getPerson", - "responses": { - "200": { - "$ref": "#/components/responses/PersonResponse" - } - } - } - } - }, - "components": { - "schemas": { - "OrganizationWrapper": { - "type": "object", - "properties": { - "id": {"type": "string"} - } - }, - "PersonWrapper": { - "type": "object", - "properties": { - "id": {"type": "string"} - } - } - }, - "responses": { - "CustomerResponse": { - "description": "Get Customer", - "content": { - "application/json": { - "schema": { - "oneOf": [ - { - "$ref": "#/components/schemas/OrganizationWrapper" - }, - { - "$ref": "#/components/schemas/PersonWrapper" - } - ] - } - } - } - }, - "PersonResponse": { - "description": "Get Person", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PersonWrapper" - } - } - } - } - } - } -} From 16f897f82247392a7c6cd52c0de6d9993cbe7cbf Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Tue, 28 Jul 2020 11:55:42 +0200 Subject: [PATCH 24/33] remove interface method --- .../openapitools/codegen/CodegenConfig.java | 2 +- .../openapitools/codegen/DefaultCodegen.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java index 3f52424b6170..5371be199eb3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java @@ -174,7 +174,7 @@ public interface CodegenConfig { String toModelImport(String name); - Map toModelImportMap(String name); +// Map toModelImportMap(String name); String toApiImport(String name); 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 841e6f68c58c..b892635fcc6c 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 @@ -1368,15 +1368,15 @@ public String toModelImport(String name) { } } - /** - * Returns the same content as [[toModelImport]] with key the fully-qualified Model name and value the initial input. - * In case of union types this method has a key for each separate model and import. - * @param name the name of the "Model" - * @return Map of fully-qualified models. - */ - public Map toModelImportMap(String name){ - return Collections.singletonMap(this.toModelImport(name),name); - } +// /** +// * Returns the same content as [[toModelImport]] with key the fully-qualified Model name and value the initial input. +// * In case of union types this method has a key for each separate model and import. +// * @param name the name of the "Model" +// * @return Map of fully-qualified models. +// */ +// public Map toModelImportMap(String name){ +// return Collections.singletonMap(this.toModelImport(name),name); +// } /** * Return the fully-qualified "Api" name for import From 83b5e6f477e48681dd67a704b6da6f8766131496 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Tue, 28 Jul 2020 13:08:17 +0200 Subject: [PATCH 25/33] remove test class completely --- .../typescript/SharedTypeScriptTest.java | 67 ------------------- 1 file changed, 67 deletions(-) delete mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java deleted file mode 100644 index 570b8fb86cf6..000000000000 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.openapitools.codegen.typescript; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; -import org.openapitools.codegen.DefaultGenerator; -import org.openapitools.codegen.Generator; -import org.openapitools.codegen.config.CodegenConfigurator; -import org.openapitools.codegen.languages.TypeScriptAxiosClientCodegen; -import org.testng.Assert; -import org.testng.annotations.Test; - -import java.io.File; -import java.io.IOException; -import java.util.List; - -public class SharedTypeScriptTest { - @Test - public void typesInImportsAreSplitted() throws IOException { -// CodegenConfigurator config = -// new CodegenConfigurator() -// .setInputSpec("split-import.json") -// .setModelPackage("model") -// .setApiPackage("api") -// .addAdditionalProperty( -// TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); -// -// config.setGeneratorName("typescript-axios"); -// checkAPIFile(getGenerator(config).generate(), "default-api.ts"); -// -// config.setGeneratorName("typescript-node"); -// checkAPIFile(getGenerator(config).generate(), "defaultApi.ts"); -// -// config.setGeneratorName("typescript-angular"); -// checkAPIFile(getGenerator(config).generate(), "default.service.ts"); - - } - - private Generator getGenerator(CodegenConfigurator config) { - return new DefaultGenerator().opts(config.toClientOptInput()); - } - - private void checkAPIFile(List files, String apiFileName) throws IOException { - File apiFile = files.stream().filter(file->file.getName().contains(apiFileName)).findFirst().get(); - String apiFileContent = FileUtils.readFileToString(apiFile); - Assert.assertTrue(!apiFileContent.contains("import { OrganizationWrapper | PersonWrapper }")); - Assert.assertEquals(StringUtils.countMatches(apiFileContent,"import { PersonWrapper }"),1); - Assert.assertEquals(StringUtils.countMatches(apiFileContent,"import { OrganizationWrapper }"),1); - } - - @Test - public void oldImportsStillThere() throws IOException { - CodegenConfigurator config = - new CodegenConfigurator() - .setInputSpec("petstore.json") - .setModelPackage("model") - .setApiPackage("api") - .addAdditionalProperty( - TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); - - config.setGeneratorName("typescript-angular"); - final List files = getGenerator(config).generate(); - File pets = files.stream().filter(file->file.getName().contains("pet.ts")).findFirst().get(); - String apiFileContent = FileUtils.readFileToString(pets); - Assert.assertTrue(apiFileContent.contains("import { Category }")); - Assert.assertTrue(apiFileContent.contains("import { Tag }")); - } -} From dc0f5751900ba7fd0552f185aee7514a85135476 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Mon, 3 Aug 2020 08:40:41 +0200 Subject: [PATCH 26/33] put test class back - test body commented out --- .../typescript/SharedTypeScriptTest.java | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java new file mode 100644 index 000000000000..5bb554c9284f --- /dev/null +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java @@ -0,0 +1,67 @@ +package org.openapitools.codegen.typescript; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; +import org.openapitools.codegen.DefaultGenerator; +import org.openapitools.codegen.Generator; +import org.openapitools.codegen.config.CodegenConfigurator; +import org.openapitools.codegen.languages.TypeScriptAxiosClientCodegen; +import org.testng.Assert; +import org.testng.annotations.Test; + +import java.io.File; +import java.io.IOException; +import java.util.List; + +public class SharedTypeScriptTest { + @Test + public void typesInImportsAreSplitted() throws IOException { +// CodegenConfigurator config = +// new CodegenConfigurator() +// .setInputSpec("split-import.json") +// .setModelPackage("model") +// .setApiPackage("api") +// .addAdditionalProperty( +// TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); +// +// config.setGeneratorName("typescript-axios"); +// checkAPIFile(getGenerator(config).generate(), "default-api.ts"); +// +// config.setGeneratorName("typescript-node"); +// checkAPIFile(getGenerator(config).generate(), "defaultApi.ts"); +// +// config.setGeneratorName("typescript-angular"); +// checkAPIFile(getGenerator(config).generate(), "default.service.ts"); + + } + + private Generator getGenerator(CodegenConfigurator config) { + return new DefaultGenerator().opts(config.toClientOptInput()); + } + + private void checkAPIFile(List files, String apiFileName) throws IOException { + File apiFile = files.stream().filter(file->file.getName().contains(apiFileName)).findFirst().get(); + String apiFileContent = FileUtils.readFileToString(apiFile); + Assert.assertTrue(!apiFileContent.contains("import { OrganizationWrapper | PersonWrapper }")); + Assert.assertEquals(StringUtils.countMatches(apiFileContent,"import { PersonWrapper }"),1); + Assert.assertEquals(StringUtils.countMatches(apiFileContent,"import { OrganizationWrapper }"),1); + } + + @Test + public void oldImportsStillThere() throws IOException { +// CodegenConfigurator config = +// new CodegenConfigurator() +// .setInputSpec("petstore.json") +// .setModelPackage("model") +// .setApiPackage("api") +// .addAdditionalProperty( +// TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); +// +// config.setGeneratorName("typescript-angular"); +// final List files = getGenerator(config).generate(); +// File pets = files.stream().filter(file->file.getName().contains("pet.ts")).findFirst().get(); +// String apiFileContent = FileUtils.readFileToString(pets); +// Assert.assertTrue(apiFileContent.contains("import { Category }")); +// Assert.assertTrue(apiFileContent.contains("import { Tag }")); + } +} \ No newline at end of file From de585d5b3392f92d392ab7d7d25499e94ece889e Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Mon, 3 Aug 2020 09:16:11 +0200 Subject: [PATCH 27/33] rename test methods --- .../openapitools/codegen/typescript/SharedTypeScriptTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java index 5bb554c9284f..0451cf03a74c 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java @@ -15,7 +15,7 @@ public class SharedTypeScriptTest { @Test - public void typesInImportsAreSplitted() throws IOException { + public void typesInImportsAreSplittedTest() throws IOException { // CodegenConfigurator config = // new CodegenConfigurator() // .setInputSpec("split-import.json") @@ -48,7 +48,7 @@ private void checkAPIFile(List files, String apiFileName) throws IOExcepti } @Test - public void oldImportsStillThere() throws IOException { + public void oldImportsStillPresentTest() throws IOException { // CodegenConfigurator config = // new CodegenConfigurator() // .setInputSpec("petstore.json") From 40dce449a0c449cbdb16019df75c2c98365d46d5 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Mon, 3 Aug 2020 11:04:12 +0200 Subject: [PATCH 28/33] put back logic and tests --- .../openapitools/codegen/CodegenConfig.java | 2 +- .../openapitools/codegen/DefaultCodegen.java | 18 ++-- .../codegen/DefaultGenerator.java | 89 ++++++++----------- .../AbstractTypeScriptClientCodegen.java | 60 ++++++------- .../typescript/SharedTypeScriptTest.java | 60 ++++++------- .../src/test/resources/split-import.json | 74 +++++++++++++++ 6 files changed, 179 insertions(+), 124 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/split-import.json diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java index 5371be199eb3..3f52424b6170 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java @@ -174,7 +174,7 @@ public interface CodegenConfig { String toModelImport(String name); -// Map toModelImportMap(String name); + Map toModelImportMap(String name); String toApiImport(String name); 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 b892635fcc6c..841e6f68c58c 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 @@ -1368,15 +1368,15 @@ public String toModelImport(String name) { } } -// /** -// * Returns the same content as [[toModelImport]] with key the fully-qualified Model name and value the initial input. -// * In case of union types this method has a key for each separate model and import. -// * @param name the name of the "Model" -// * @return Map of fully-qualified models. -// */ -// public Map toModelImportMap(String name){ -// return Collections.singletonMap(this.toModelImport(name),name); -// } + /** + * Returns the same content as [[toModelImport]] with key the fully-qualified Model name and value the initial input. + * In case of union types this method has a key for each separate model and import. + * @param name the name of the "Model" + * @return Map of fully-qualified models. + */ + public Map toModelImportMap(String name){ + return Collections.singletonMap(this.toModelImport(name),name); + } /** * Return the fully-qualified "Api" name for import diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 000f7efac635..7fbffa50b621 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -1077,27 +1077,8 @@ private Map processOperations(CodegenConfig config, String tag, allImports.addAll(op.imports); } -// Map mappings = getAllImportsMapppings(allImports); -// List> imports = toImportsObjects(mappings); - - List> imports = new ArrayList<>(); - Set mappingSet = new TreeSet<>(); - for (String nextImport : allImports) { - Map im = new LinkedHashMap<>(); - String mapping = config.importMapping().get(nextImport); - if (mapping == null) { - mapping = config.toModelImport(nextImport); - } - - if (mapping != null && !mappingSet.contains(mapping)) { // ensure import (mapping) is unique - mappingSet.add(mapping); - im.put("import", mapping); - im.put("classname", nextImport); - if (!imports.contains(im)) { // avoid duplicates - imports.add(im); - } - } - } + Map mappings = getAllImportsMapppings(allImports); + List> imports = toImportsObjects(mappings); operations.put("imports", imports); @@ -1118,39 +1099,39 @@ private Map processOperations(CodegenConfig config, String tag, return operations; } -// private Map getAllImportsMapppings(Set allImports){ -// Map result = new HashMap<>(); -// allImports.forEach(nextImport->{ -// String mapping = config.importMapping().get(nextImport); -// if(mapping!= null){ -// result.put(mapping,nextImport); -// }else{ -// result.putAll(config.toModelImportMap(nextImport)); -// } -// }); -// return result; -// } -// -// private List> toImportsObjects(Map mappedImports){ -// List> result = new ArrayList<>(); -// mappedImports.entrySet().forEach(mapping->{ -// Map im = new LinkedHashMap<>(); -// im.put("import", mapping.getKey()); -// im.put("classname", mapping.getValue()); -// if (!result.contains(im)) { // avoid duplicates -// result.add(im); -// } -// }); -// Collections.sort(result, new Comparator>() { -// @Override -// public int compare(final Map o1, final Map o2) { -// String s1 = o1.get("classname"); -// String s2 = o2.get("classname"); -// return s1.compareTo(s2); -// } -// }); -// return result; -// } + private Map getAllImportsMapppings(Set allImports){ + Map result = new HashMap<>(); + allImports.forEach(nextImport->{ + String mapping = config.importMapping().get(nextImport); + if(mapping!= null){ + result.put(mapping,nextImport); + }else{ + result.putAll(config.toModelImportMap(nextImport)); + } + }); + return result; + } + + private List> toImportsObjects(Map mappedImports){ + List> result = new ArrayList<>(); + mappedImports.entrySet().forEach(mapping->{ + Map im = new LinkedHashMap<>(); + im.put("import", mapping.getKey()); + im.put("classname", mapping.getValue()); + if (!result.contains(im)) { // avoid duplicates + result.add(im); + } + }); + Collections.sort(result, new Comparator>() { + @Override + public int compare(final Map o1, final Map o2) { + String s1 = o1.get("classname"); + String s2 = o2.get("classname"); + return s1.compareTo(s2); + } + }); + return result; + } private Map processModels(CodegenConfig config, Map definitions) { Map objs = new HashMap<>(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index 273502c2a79d..09754b26b7a6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -224,36 +224,36 @@ public void processOpts() { } } -// @Override -// public String toModelImport( String name){ -// if(name.contains("|")){ -// List names = Arrays.asList(name.split("\\|")); -// LOGGER.warn("The import is a union type. Consider using the toModelImportMap method."); -// return names.stream() -// .map(withSpace->withSpace.replaceAll(" ","")) -// .map(noSpace->super.toModelImport(noSpace)) -// .collect(Collectors.joining("|")); -// } -// return super.toModelImport(name); -// } - -// /** -// * Maps the fully qualified model import to the initial given name. In case of union types the map will have multiple entries. -// * For example for "classA | classB" the map will two entries have ["model.classA","classA"] and ["model.classB","classB"]. -// * -// * @param name the name of the "Model" -// * @return Map between the fully qualified model import and the initial given name. -// */ -// @Override -// public Map toModelImportMap( String name){ -// if(name.contains("|")){ -// List names = Arrays.asList(name.replace(" ","").split("\\|")); -// Map result = Maps.newHashMap(); -// names.forEach(s->result.put(toModelImport(s),s)); -// return result; -// } -// return Collections.singletonMap(toModelImport(name),name); -// } + @Override + public String toModelImport( String name){ + if(name.contains("|")){ + List names = Arrays.asList(name.split("\\|")); + LOGGER.warn("The import is a union type. Consider using the toModelImportMap method."); + return names.stream() + .map(withSpace->withSpace.replaceAll(" ","")) + .map(noSpace->super.toModelImport(noSpace)) + .collect(Collectors.joining("|")); + } + return super.toModelImport(name); + } + + /** + * Maps the fully qualified model import to the initial given name. In case of union types the map will have multiple entries. + * For example for "classA | classB" the map will two entries have ["model.classA","classA"] and ["model.classB","classB"]. + * + * @param name the name of the "Model" + * @return Map between the fully qualified model import and the initial given name. + */ + @Override + public Map toModelImportMap( String name){ + if(name.contains("|")){ + List names = Arrays.asList(name.replace(" ","").split("\\|")); + Map result = Maps.newHashMap(); + names.forEach(s->result.put(toModelImport(s),s)); + return result; + } + return Collections.singletonMap(toModelImport(name),name); + } @Override diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java index 0451cf03a74c..b60f46e7bdad 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java @@ -16,22 +16,22 @@ public class SharedTypeScriptTest { @Test public void typesInImportsAreSplittedTest() throws IOException { -// CodegenConfigurator config = -// new CodegenConfigurator() -// .setInputSpec("split-import.json") -// .setModelPackage("model") -// .setApiPackage("api") -// .addAdditionalProperty( -// TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); -// -// config.setGeneratorName("typescript-axios"); -// checkAPIFile(getGenerator(config).generate(), "default-api.ts"); -// -// config.setGeneratorName("typescript-node"); -// checkAPIFile(getGenerator(config).generate(), "defaultApi.ts"); -// -// config.setGeneratorName("typescript-angular"); -// checkAPIFile(getGenerator(config).generate(), "default.service.ts"); + CodegenConfigurator config = + new CodegenConfigurator() + .setInputSpec("src/test/resources//split-import.json") + .setModelPackage("model") + .setApiPackage("api") + .addAdditionalProperty( + TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); + + config.setGeneratorName("typescript-axios"); + checkAPIFile(getGenerator(config).generate(), "default-api.ts"); + + config.setGeneratorName("typescript-node"); + checkAPIFile(getGenerator(config).generate(), "defaultApi.ts"); + + config.setGeneratorName("typescript-angular"); + checkAPIFile(getGenerator(config).generate(), "default.service.ts"); } @@ -49,19 +49,19 @@ private void checkAPIFile(List files, String apiFileName) throws IOExcepti @Test public void oldImportsStillPresentTest() throws IOException { -// CodegenConfigurator config = -// new CodegenConfigurator() -// .setInputSpec("petstore.json") -// .setModelPackage("model") -// .setApiPackage("api") -// .addAdditionalProperty( -// TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); -// -// config.setGeneratorName("typescript-angular"); -// final List files = getGenerator(config).generate(); -// File pets = files.stream().filter(file->file.getName().contains("pet.ts")).findFirst().get(); -// String apiFileContent = FileUtils.readFileToString(pets); -// Assert.assertTrue(apiFileContent.contains("import { Category }")); -// Assert.assertTrue(apiFileContent.contains("import { Tag }")); + CodegenConfigurator config = + new CodegenConfigurator() + .setInputSpec("petstore.json") + .setModelPackage("model") + .setApiPackage("api") + .addAdditionalProperty( + TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); + + config.setGeneratorName("typescript-angular"); + final List files = getGenerator(config).generate(); + File pets = files.stream().filter(file->file.getName().contains("pet.ts")).findFirst().get(); + String apiFileContent = FileUtils.readFileToString(pets); + Assert.assertTrue(apiFileContent.contains("import { Category }")); + Assert.assertTrue(apiFileContent.contains("import { Tag }")); } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/resources/split-import.json b/modules/openapi-generator/src/test/resources/split-import.json new file mode 100644 index 000000000000..736517af4635 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/split-import.json @@ -0,0 +1,74 @@ +{ + "openapi": "3.0.2", + "info": { + "title": "SAP Graph - Customers API", + "version": "0.1.0" + }, + "paths": { + "/Customer": { + "get": { + "operationId": "getCustomer", + "responses": { + "200": { + "$ref": "#/components/responses/CustomerResponse" + } + } + } + }, + "/Person": { + "get": { + "operationId": "getPerson", + "responses": { + "200": { + "$ref": "#/components/responses/PersonResponse" + } + } + } + } + }, + "components": { + "schemas": { + "OrganizationWrapper": { + "type": "object", + "properties": { + "id": {"type": "string"} + } + }, + "PersonWrapper": { + "type": "object", + "properties": { + "id": {"type": "string"} + } + } + }, + "responses": { + "CustomerResponse": { + "description": "Get Customer", + "content": { + "application/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/OrganizationWrapper" + }, + { + "$ref": "#/components/schemas/PersonWrapper" + } + ] + } + } + } + }, + "PersonResponse": { + "description": "Get Person", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PersonWrapper" + } + } + } + } + } + } +} From 7cc0b16a6a888ce1aee8ee170fa1f4eccb287dbe Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Mon, 3 Aug 2020 13:16:49 +0200 Subject: [PATCH 29/33] remove generated APIs --- .../codegen/typescript/SharedTypeScriptTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java index b60f46e7bdad..9062d738689b 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java @@ -18,9 +18,10 @@ public class SharedTypeScriptTest { public void typesInImportsAreSplittedTest() throws IOException { CodegenConfigurator config = new CodegenConfigurator() - .setInputSpec("src/test/resources//split-import.json") + .setInputSpec("src/test/resources/split-import.json") .setModelPackage("model") .setApiPackage("api") + .setOutputDir("src/test/resources/typesInImportsAreSplittedTest") .addAdditionalProperty( TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); @@ -33,6 +34,7 @@ public void typesInImportsAreSplittedTest() throws IOException { config.setGeneratorName("typescript-angular"); checkAPIFile(getGenerator(config).generate(), "default.service.ts"); + FileUtils.deleteDirectory(new File("src/test/resources/typesInImportsAreSplittedTest")); } private Generator getGenerator(CodegenConfigurator config) { @@ -54,6 +56,7 @@ public void oldImportsStillPresentTest() throws IOException { .setInputSpec("petstore.json") .setModelPackage("model") .setApiPackage("api") + .setOutputDir("src/test/resources/oldImportsStillPresentTest/") .addAdditionalProperty( TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true); @@ -63,5 +66,7 @@ public void oldImportsStillPresentTest() throws IOException { String apiFileContent = FileUtils.readFileToString(pets); Assert.assertTrue(apiFileContent.contains("import { Category }")); Assert.assertTrue(apiFileContent.contains("import { Tag }")); + + FileUtils.deleteDirectory(new File("src/test/resources/oldImportsStillPresentTest/")); } } \ No newline at end of file From 1aff13b3cb5e5d29588d49dc74fd089482dc78ea Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Tue, 4 Aug 2020 09:36:41 +0200 Subject: [PATCH 30/33] remark amakhrov --- .../AbstractTypeScriptClientCodegen.java | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index 09754b26b7a6..bc3755b29af6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -226,13 +226,9 @@ public void processOpts() { @Override public String toModelImport( String name){ - if(name.contains("|")){ - List names = Arrays.asList(name.split("\\|")); + if(isUnionType(name)){ LOGGER.warn("The import is a union type. Consider using the toModelImportMap method."); - return names.stream() - .map(withSpace->withSpace.replaceAll(" ","")) - .map(noSpace->super.toModelImport(noSpace)) - .collect(Collectors.joining("|")); + return toModelImportMap(name).values().stream().collect(Collectors.joining("|")); } return super.toModelImport(name); } @@ -246,15 +242,28 @@ public String toModelImport( String name){ */ @Override public Map toModelImportMap( String name){ - if(name.contains("|")){ - List names = Arrays.asList(name.replace(" ","").split("\\|")); - Map result = Maps.newHashMap(); - names.forEach(s->result.put(toModelImport(s),s)); - return result; + if(isUnionType(name)){ + String[] names = splitUnionType(name); + return toImportMap(names); } - return Collections.singletonMap(toModelImport(name),name); + return toImportMap(name); } + private boolean isUnionType(String name){ + return name.contains("|"); + } + + private String[] splitUnionType(String name){ + return name.replace(" ","").split("\\|"); + } + + private Map toImportMap(String... names){ + Map result = Maps.newHashMap(); + for(String name: names){ + result.put(super.toModelImport(name),name); + } + return result; + } @Override public void preprocessOpenAPI(OpenAPI openAPI) { From 1fb99beb26791b15a9222968f0363e9f57dde044 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Tue, 4 Aug 2020 10:45:45 +0200 Subject: [PATCH 31/33] check in one generated file to test --- .../client/petstore/go/go-petstore-withXml/api/openapi.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml b/samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml index 2fe0565e0a54..7a47b6f9bee7 100644 --- a/samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml +++ b/samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml @@ -2090,12 +2090,10 @@ components: properties: breed: type: string - type: object Cat_allOf: properties: declawed: type: boolean - type: object BigCat_allOf: properties: kind: @@ -2105,7 +2103,6 @@ components: - leopards - jaguars type: string - type: object securitySchemes: petstore_auth: flows: From 24dc8ce2d864d84a6f51f4e58c77b3671c5ca98c Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Tue, 4 Aug 2020 11:02:38 +0200 Subject: [PATCH 32/33] adjust call super --- .../codegen/languages/AbstractTypeScriptClientCodegen.java | 2 +- .../client/petstore/go/go-petstore-withXml/api/openapi.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index 60ae4372c34e..7cd75706b27d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -263,7 +263,7 @@ private String[] splitUnionType(String name){ private Map toImportMap(String... names){ Map result = Maps.newHashMap(); for(String name: names){ - result.put(super.toModelImport(name),name); + result.put(toModelImport(name),name); } return result; } diff --git a/samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml b/samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml index 7a47b6f9bee7..2fe0565e0a54 100644 --- a/samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml +++ b/samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml @@ -2090,10 +2090,12 @@ components: properties: breed: type: string + type: object Cat_allOf: properties: declawed: type: boolean + type: object BigCat_allOf: properties: kind: @@ -2103,6 +2105,7 @@ components: - leopards - jaguars type: string + type: object securitySchemes: petstore_auth: flows: From d0761607197dbbc7b48ebc12782fd4fabd24ea82 Mon Sep 17 00:00:00 2001 From: Frank Essenberger Date: Thu, 13 Aug 2020 17:25:26 +0200 Subject: [PATCH 33/33] add comment use set. --- .../codegen/DefaultGenerator.java | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 7fbffa50b621..c73e1f5fb131 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -58,6 +58,7 @@ import java.nio.file.Path; import java.time.ZonedDateTime; import java.util.*; +import java.util.stream.Collectors; import static org.openapitools.codegen.utils.OnceLogger.once; @@ -1077,10 +1078,11 @@ private Map processOperations(CodegenConfig config, String tag, allImports.addAll(op.imports); } - Map mappings = getAllImportsMapppings(allImports); - List> imports = toImportsObjects(mappings); + Map mappings = getAllImportsMappings(allImports); + Set> imports = toImportsObjects(mappings); - operations.put("imports", imports); + //Some codegen implementations rely on a list interface for the imports + operations.put("imports", imports.stream().collect(Collectors.toList())); // add a flag to indicate whether there's any {{import}} if (imports.size() > 0) { @@ -1099,7 +1101,12 @@ private Map processOperations(CodegenConfig config, String tag, return operations; } - private Map getAllImportsMapppings(Set allImports){ + /** + * Transforms a set of imports to a map with key config.toModelImport(import) and value the import string. + * @param allImports - Set of imports + * @return Map of fully qualified import path and initial import. + */ + private Map getAllImportsMappings(Set allImports){ Map result = new HashMap<>(); allImports.forEach(nextImport->{ String mapping = config.importMapping().get(nextImport); @@ -1112,23 +1119,27 @@ private Map getAllImportsMapppings(Set allImports){ return result; } - private List> toImportsObjects(Map mappedImports){ - List> result = new ArrayList<>(); - mappedImports.entrySet().forEach(mapping->{ - Map im = new LinkedHashMap<>(); - im.put("import", mapping.getKey()); - im.put("classname", mapping.getValue()); - if (!result.contains(im)) { // avoid duplicates - result.add(im); - } - }); - Collections.sort(result, new Comparator>() { - @Override - public int compare(final Map o1, final Map o2) { + /** + * Using an import map created via {@link #getAllImportsMappings(Set)} to build a list import objects. + * The import objects have two keys: import and classname which hold the key and value of the initial map entry. + * + * @param mappedImports Map of fully qualified import and import + * @return The set of unique imports + */ + private Set> toImportsObjects(Map mappedImports){ + Set> result = new TreeSet>( + (Comparator>) (o1, o2) -> { String s1 = o1.get("classname"); String s2 = o2.get("classname"); return s1.compareTo(s2); } + ); + + mappedImports.entrySet().forEach(mapping->{ + Map im = new LinkedHashMap<>(); + im.put("import", mapping.getKey()); + im.put("classname", mapping.getValue()); + result.add(im); }); return result; }