fix import mapping for return types (#14525) (#15719)

* importContainerType = true

* add unit test

* disable MyImportTest

* build all samples, add import exceptions

* simplify code

* delete myImportTest

* generate docs

* extend comment

* remove inline comment

docs/generators/groovy.md

@@ -123,6 +123,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>File</li>
 <li>Float</li>
 <li>Integer</li>
+<li>List</li>
 <li>Long</li>
 <li>Map</li>
 <li>Object</li>

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -659,6 +659,23 @@ public class DefaultCodegen implements CodegenConfig {
         return objs;
     }
 
+    /**
+     * Removes importToRemove from the imports of objs, if present.
+     * This is useful to remove imports that are already present in operations-related template files, to avoid importing the same thing twice.
+     *
+     * @param objs imports will be removed from this objs' imports collection
+     * @param importToRemove the import statement to be removed
+     */
+    protected void removeImport(OperationsMap objs, String importToRemove) {
+        List<Map<String, String>> imports = objs.getImports();
+        for (Iterator<Map<String, String>> itr = imports.iterator(); itr.hasNext(); ) {
+            String itrImport = itr.next().get("import");
+            if (itrImport.equals(importToRemove)) {
+                itr.remove();
+            }
+        }
+    }
+
     /**
      * Removes imports from the model that points to itself
      * Marks a self referencing property, if detected
@@ -5196,7 +5213,7 @@ public class DefaultCodegen implements CodegenConfig {
             codegenParameter.dataType = codegenProperty.dataType;
         }
         if (!addSchemaImportsFromV3SpecLocations) {
-            if (ModelUtils.isSet(parameterSchema)) {
+            if (ModelUtils.isArraySchema(parameterSchema)) {
                 imports.add(codegenProperty.baseType);
             }
         }
@@ -7403,7 +7420,7 @@ public class DefaultCodegen implements CodegenConfig {
                 if (addSchemaImportsFromV3SpecLocations) {
                     addImports(imports, schemaProp.getImports(importContainerType, importBaseType, generatorMetadata.getFeatureSet()));
                 } else {
-                    addImports(imports, schemaProp.getImports(false, importBaseType, generatorMetadata.getFeatureSet()));
+                    addImports(imports, schemaProp.getImports(true, importBaseType, generatorMetadata.getFeatureSet()));
                 }
             }
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtClientCodegen.java

@@ -24,8 +24,11 @@ import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.meta.features.DocumentationFeature;
 import org.openapitools.codegen.meta.features.GlobalFeature;
 import org.openapitools.codegen.meta.features.SecurityFeature;
+import org.openapitools.codegen.model.ModelMap;
+import org.openapitools.codegen.model.OperationsMap;
 
 import java.io.File;
+import java.util.List;
 
 import static org.openapitools.codegen.utils.StringUtils.*;
 
@@ -221,4 +224,11 @@ public class CppQtClientCodegen extends CppQtAbstractCodegen implements CodegenC
     public void setOptionalProjectFileFlag(boolean flag) {
         this.optionalProjectFileFlag = flag;
     }
+
+    @Override
+    public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
+        objs = super.postProcessOperationsWithModels(objs, allModels);
+        removeImport(objs, "#include <QList>");
+        return objs;
+    }
 }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTinyClientCodegen.java

@@ -23,6 +23,8 @@ import io.swagger.v3.parser.util.SchemaTypeUtil;
 import org.openapitools.codegen.meta.features.*;
 import org.openapitools.codegen.meta.GeneratorMetadata;
 import org.openapitools.codegen.meta.Stability;
+import org.openapitools.codegen.model.ModelMap;
+import org.openapitools.codegen.model.OperationsMap;
 import org.openapitools.codegen.utils.ModelUtils;
 
 import java.io.File;
@@ -340,5 +342,11 @@ public class CppTinyClientCodegen extends AbstractCppCodegen implements CodegenC
         return "null";
     }
 
+    @Override
+    public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
+        objs = super.postProcessOperationsWithModels(objs, allModels);
+        removeImport(objs, "#include <list>");
+        return objs;
+    }
 
 }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java

@@ -68,6 +68,7 @@ public class GroovyClientCodegen extends AbstractJavaCodegen {
         languageSpecificPrimitives.add("ArrayList");
         languageSpecificPrimitives.add("File");
         languageSpecificPrimitives.add("Map");
+        languageSpecificPrimitives.add("List");
 
         // this must not be OS-specific
         sourceFolder = projectFolder + "/groovy";

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java

@@ -19,18 +19,19 @@ package org.openapitools.codegen.languages;
 
 import io.swagger.v3.oas.models.media.ComposedSchema;
 import io.swagger.v3.oas.models.media.Schema;
-import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.languages.features.CXFServerFeatures;
 import org.openapitools.codegen.languages.features.GzipTestFeatures;
 import org.openapitools.codegen.languages.features.LoggingTestFeatures;
 import org.openapitools.codegen.languages.features.UseGenericResponseFeatures;
+import org.openapitools.codegen.model.ModelMap;
+import org.openapitools.codegen.model.OperationsMap;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.util.Set;
+import java.util.List;
 
 public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen
         implements CXFServerFeatures, GzipTestFeatures, LoggingTestFeatures, UseGenericResponseFeatures {
@@ -263,6 +264,13 @@ public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen
         }
     }
 
+    @Override
+    public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
+        objs = super.postProcessOperationsWithModels(objs, allModels);
+        removeImport(objs, "java.util.List");
+        return objs;
+    }
+
     @Override
     public String getHelp() {
         return "Generates a Java JAXRS Server application based on Apache CXF framework.";

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java

@@ -19,8 +19,11 @@ package org.openapitools.codegen.languages;
 
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.languages.features.BeanValidationFeatures;
+import org.openapitools.codegen.model.ModelMap;
+import org.openapitools.codegen.model.OperationsMap;
 
 import java.io.File;
+import java.util.List;
 
 /**
  * Generates a Java JAXRS Server according to JAXRS 2.0 specification, assuming an
@@ -98,6 +101,13 @@ public class JavaJAXRSCXFCDIServerCodegen extends JavaJAXRSSpecServerCodegen imp
         model.imports.add("JsonProperty");
     }
 
+    @Override
+    public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
+        objs = super.postProcessOperationsWithModels(objs, allModels);
+        removeImport(objs, "java.util.List");
+        return objs;
+    }
+
     @Override
     public String getHelp() {
         return "Generates a Java JAXRS Server according to JAXRS 2.0 specification, assuming an "

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java

@@ -21,9 +21,12 @@ import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.meta.features.DocumentationFeature;
+import org.openapitools.codegen.model.ModelMap;
+import org.openapitools.codegen.model.OperationsMap;
 import org.openapitools.codegen.meta.features.SecurityFeature;
 
 import java.io.File;
+import java.util.List;
 import java.util.Map;
 
 import static org.openapitools.codegen.languages.features.GzipFeatures.USE_GZIP_FEATURE;
@@ -314,4 +317,11 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
         }
     }
 
+    @Override
+    public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
+        objs = super.postProcessOperationsWithModels(objs, allModels);
+        removeImport(objs, "java.util.List");
+        return objs;
+    }
+
 }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java

@@ -23,6 +23,7 @@ import org.openapitools.codegen.*;
 import org.openapitools.codegen.meta.features.DocumentationFeature;
 import org.openapitools.codegen.model.ModelMap;
 import org.openapitools.codegen.model.ModelsMap;
+import org.openapitools.codegen.model.OperationsMap;
 
 import java.util.*;
 
@@ -154,4 +155,11 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen {
         return objs;
     }
 
+    @Override
+    public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
+        objs = super.postProcessOperationsWithModels(objs, allModels);
+        removeImport(objs, "java.util.List");
+        return objs;
+    }
+
 }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java

@@ -32,7 +32,6 @@ import java.io.File;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
@@ -371,6 +370,8 @@ public class JavaPlayFrameworkCodegen extends AbstractJavaCodegen implements Bea
             }
         }
 
+        removeImport(objs, "java.util.List");
+
         return objs;
     }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyEapServerCodegen.java

@@ -25,6 +25,7 @@ import org.openapitools.codegen.languages.features.SwaggerFeatures;
 import org.openapitools.codegen.meta.features.DocumentationFeature;
 import org.openapitools.codegen.model.ModelMap;
 import org.openapitools.codegen.model.ModelsMap;
+import org.openapitools.codegen.model.OperationsMap;
 
 import java.io.File;
 import java.util.HashMap;
@@ -152,6 +153,13 @@ public class JavaResteasyEapServerCodegen extends AbstractJavaJAXRSServerCodegen
         return objs;
     }
 
+    @Override
+    public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
+        objs = super.postProcessOperationsWithModels(objs, allModels);
+        removeImport(objs, "java.util.List");
+        return objs;
+    }
+
     public void setUseBeanValidation(boolean useBeanValidation) {
         this.useBeanValidation = useBeanValidation;
     }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyServerCodegen.java

@@ -23,11 +23,10 @@ import org.openapitools.codegen.languages.features.JbossFeature;
 import org.openapitools.codegen.meta.features.DocumentationFeature;
 import org.openapitools.codegen.model.ModelMap;
 import org.openapitools.codegen.model.ModelsMap;
+import org.openapitools.codegen.model.OperationsMap;
 
 import java.io.File;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen implements JbossFeature {
 
@@ -163,6 +162,13 @@ public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen im
         return objs;
     }
 
+    @Override
+    public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
+        objs = super.postProcessOperationsWithModels(objs, allModels);
+        removeImport(objs, "java.util.List");
+        return objs;
+    }
+
     public void setGenerateJbossDeploymentDescriptor(boolean generateJbossDeploymentDescriptor) {
         this.generateJbossDeploymentDescriptor = generateJbossDeploymentDescriptor;
     }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java

@@ -124,7 +124,8 @@ public class NimClientCodegen extends DefaultCodegen implements CodegenConfig {
 
         defaultIncludes = new HashSet<>(
                 Arrays.asList(
-                        "array"
+                        "array",
+                        "map"
                 )
         );
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java

@@ -23,16 +23,7 @@ import static org.openapitools.codegen.utils.StringUtils.camelize;
 
 import java.io.File;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 
@@ -874,6 +865,8 @@ public class SpringCodegen extends AbstractJavaCodegen
             objs.put("tagDescription", escapeText(firstTag.getDescription()));
         }
 
+        removeImport(objs, "java.util.List");
+
         return objs;
     }
 

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java

@@ -1770,6 +1770,28 @@ public class JavaClientCodegenTest {
                 .containsWithName("NotNull");
     }
 
+    @Test
+    public void testReturnTypeMapping() throws IOException {
+        File output = Files.createTempDirectory("test").toFile();
+        output.deleteOnExit();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("java")
+                .setInputSpec("src/test/resources/3_0/issue14525.yaml")
+                .addTypeMapping("array","Stack")
+                .addImportMapping("Stack","java.util.Stack")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+        DefaultGenerator generator = new DefaultGenerator();
+        generator.opts(clientOptInput).generate();
+
+        TestUtils.assertFileContains(Paths.get(output + "/src/main/java/org/openapitools/client/api/DefaultApi.java"),
+                "import java.util.Stack;"
+        );
+
+    }
+
     @Test
     public void testNativeClientExplodedQueryParamWithArrayProperty() throws IOException {
         Map<String, Object> properties = new HashMap<>();

modules/openapi-generator/src/test/resources/3_0/issue14525.yaml

@@ -0,0 +1,18 @@
+openapi: 3.0.3
+info:
+  title: Demo app
+  version: 1.0.0
+paths:
+  /demo:
+    get:
+      summary: Demo
+      operationId: demo
+      responses:
+        '200':
+          description: Demo response
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string

samples/client/petstore/cpp-qt/client/PFXUserApi.h

@@ -18,7 +18,6 @@
 #include "PFXOauth.h"
 
 #include "PFXUser.h"
-#include <QList>
 #include <QString>
 
 #include <QObject>

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/PetApi.h

@@ -25,6 +25,7 @@
 #include "CppRestPetstoreClient/model/ApiResponse.h"
 #include "CppRestPetstoreClient/HttpContent.h"
 #include "CppRestPetstoreClient/model/Pet.h"
+#include <vector>
 #include <cpprest/details/basic_types.h>
 #include <boost/optional.hpp>
 

samples/client/petstore/cpp-tiny/lib/service/UserApi.h

@@ -9,7 +9,6 @@
 #include <list>
 
 #include "User.h"
-#include <list>
 
 namespace Tiny {
 

samples/client/petstore/groovy/src/main/groovy/org/openapitools/api/UserApi.groovy

@@ -1,7 +1,6 @@
 package org.openapitools.api;
 
 import org.openapitools.api.ApiUtils
-import java.util.List
 import org.openapitools.model.User
 
 class UserApi {

samples/client/petstore/groovy/src/main/groovy/org/openapitools/model/Pet.groovy

@@ -4,7 +4,6 @@ import groovy.transform.Canonical
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
-import java.util.List;
 import org.openapitools.model.Category;
 import org.openapitools.model.Tag;
 

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import io.swagger.annotations.*;

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import io.swagger.annotations.*;

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import org.springframework.http.ResponseEntity;

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.UserDto;
 import org.springframework.http.ResponseEntity;

samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;

samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;

samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;

samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;

samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;

samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;

samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;

samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;

samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApiController.java

@@ -1,6 +1,5 @@
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 

samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;

samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApiController.java

@@ -1,6 +1,5 @@
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 

samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;

samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiController.java

@@ -1,6 +1,5 @@
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 

samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java

@@ -1,6 +1,5 @@
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import org.springframework.http.HttpStatus;

samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;

samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApiController.java

@@ -1,6 +1,5 @@
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 

samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import org.springframework.http.HttpStatus;

samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApiController.java

@@ -1,6 +1,5 @@
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 

samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java

@@ -5,7 +5,6 @@
  */
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;

samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApiController.java

@@ -1,6 +1,5 @@
 package org.openapitools.api;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import org.openapitools.model.User;
 

samples/server/petstore/cpp-pistache/api/PetApi.h

@@ -31,6 +31,7 @@
 #include "ApiResponse.h"
 #include "Pet.h"
 #include <string>
+#include <vector>
 
 namespace org::openapitools::server::api
 {

samples/server/petstore/cpp-pistache/impl/PetApiImpl.h

@@ -32,6 +32,7 @@
 #include "ApiResponse.h"
 #include "Pet.h"
 #include <string>
+#include <vector>
 
 namespace org::openapitools::server::api
 {

samples/server/petstore/cpp-qt-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h

@@ -17,6 +17,7 @@
 #include "OAIApiResponse.h"
 #include "OAIHttpFileElement.h"
 #include "OAIPet.h"
+#include <QList>
 #include <QString>
 
 namespace OpenAPI {

samples/server/petstore/cpp-qt-qhttpengine-server/server/src/requests/OAIPetApiRequest.h

@@ -22,6 +22,7 @@
 #include "OAIApiResponse.h"
 #include "OAIHttpFileElement.h"
 #include "OAIPet.h"
+#include <QList>
 #include <QString>
 #include "OAIPetApiHandler.h"
 

samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h

@@ -42,6 +42,7 @@
 #include "User.h"
 #include <map>
 #include <string>
+#include <vector>
 
 namespace org {
 namespace openapitools {

samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.h

@@ -35,6 +35,7 @@
 #include "Pet.h"
 #include <set>
 #include <string>
+#include <vector>
 
 namespace org {
 namespace openapitools {

samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/api/FakeService.java

@@ -19,6 +19,7 @@ import org.openapitools.server.model.FakeBigDecimalMap200Response;
 import java.io.File;
 import org.openapitools.server.model.FileSchemaTestClass;
 import org.openapitools.server.model.HealthCheckResult;
+import java.util.List;
 import java.time.LocalDate;
 import java.util.Map;
 import java.time.OffsetDateTime;

samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java

@@ -19,6 +19,7 @@ import org.openapitools.server.model.FakeBigDecimalMap200Response;
 import java.io.File;
 import org.openapitools.server.model.FileSchemaTestClass;
 import org.openapitools.server.model.HealthCheckResult;
+import java.util.List;
 import java.time.LocalDate;
 import java.util.Map;
 import java.time.OffsetDateTime;

samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/api/PetService.java

@@ -13,6 +13,7 @@
 package org.openapitools.server.api;
 
 import java.io.File;
+import java.util.List;
 import org.openapitools.server.model.ModelApiResponse;
 import org.openapitools.server.model.Pet;
 import java.util.Set;

samples/server/petstore/java-helidon-server/mp/src/main/java/org/openapitools/server/api/PetServiceImpl.java

@@ -13,6 +13,7 @@
 package org.openapitools.server.api;
 
 import java.io.File;
+import java.util.List;
 import org.openapitools.server.model.ModelApiResponse;
 import org.openapitools.server.model.Pet;
 import java.util.Set;

samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/api/FakeService.java

@@ -8,6 +8,7 @@ import java.io.File;
 import org.openapitools.server.model.FileSchemaTestClass;
 import io.helidon.webserver.Handler;
 import org.openapitools.server.model.HealthCheckResult;
+import java.util.List;
 import java.time.LocalDate;
 import java.util.Map;
 import com.fasterxml.jackson.databind.ObjectMapper;

samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/api/FakeServiceImpl.java

@@ -8,6 +8,7 @@ import java.io.File;
 import org.openapitools.server.model.FileSchemaTestClass;
 import io.helidon.webserver.Handler;
 import org.openapitools.server.model.HealthCheckResult;
+import java.util.List;
 import java.time.LocalDate;
 import java.util.Map;
 import com.fasterxml.jackson.databind.ObjectMapper;

samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/api/PetService.java

@@ -2,6 +2,7 @@ package org.openapitools.server.api;
 
 import java.io.File;
 import io.helidon.webserver.Handler;
+import java.util.List;
 import org.openapitools.server.model.ModelApiResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.openapitools.server.model.Pet;

samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/api/PetServiceImpl.java

@@ -2,6 +2,7 @@ package org.openapitools.server.api;
 
 import java.io.File;
 import io.helidon.webserver.Handler;
+import java.util.List;
 import org.openapitools.server.model.ModelApiResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.openapitools.server.model.Pet;

samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java

@@ -12,6 +12,7 @@ import org.openapitools.model.Client;
 import java.util.Date;
 import java.io.File;
 import org.openapitools.model.FileSchemaTestClass;
+import java.util.List;
 import java.util.Map;
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.OuterComposite;

samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java

@@ -11,6 +11,7 @@ import org.openapitools.model.Client;
 import java.util.Date;
 import java.io.File;
 import org.openapitools.model.FileSchemaTestClass;
+import java.util.List;
 import java.util.Map;
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.OuterComposite;

samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiParam;
 import io.swagger.jaxrs.*;
 
 import java.io.File;
+import java.util.List;
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.Pet;
 import java.util.Set;

samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java

@@ -7,6 +7,7 @@ import org.wso2.msf4j.formparam.FormDataParam;
 import org.wso2.msf4j.formparam.FileInfo;
 
 import java.io.File;
+import java.util.List;
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.Pet;
 import java.util.Set;

samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java

@@ -8,6 +8,7 @@ import org.openapitools.model.Client;
 import java.util.Date;
 import java.io.File;
 import org.openapitools.model.FileSchemaTestClass;
+import java.util.List;
 import java.util.Map;
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.OuterComposite;

samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java

@@ -4,6 +4,7 @@ import org.openapitools.api.*;
 import org.openapitools.model.*;
 
 import java.io.File;
+import java.util.List;
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.Pet;
 import java.util.Set;

samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java

@@ -1,6 +1,5 @@
 package com.puppies.store.apis;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java

@@ -1,6 +1,5 @@
 package com.puppies.store.apis;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImpInterface.java

@@ -1,6 +1,5 @@
 package com.puppies.store.apis;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImpInterface.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImpInterface.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImpInterface.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImpInterface.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiController.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiControllerImp.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-nullable/app/controllers/UserApiControllerImpInterface.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImpInterface.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImpInterface.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework/app/controllers/UserApiController.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java

@@ -1,6 +1,5 @@
 package controllers;
 
-import java.util.List;
 import java.time.OffsetDateTime;
 import apimodels.User;
 

samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/UserApi.java

@@ -1,7 +1,6 @@
 package org.openapitools.api;
 
 import java.util.Date;
-import java.util.List;
 import org.openapitools.model.User;
 
 import java.io.InputStream;

samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApi.java

@@ -1,6 +1,5 @@
 package org.openapitools.api;
 
-import java.util.List;
 import org.openapitools.model.User;
 import org.openapitools.api.UserApiService;
 

samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/org/openapitools/api/UserApiService.java

@@ -6,7 +6,6 @@ import org.openapitools.model.*;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 
-import java.util.List;
 import org.openapitools.model.User;
 
 import java.util.List;

samples/server/petstore/jaxrs-cxf-cdi/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java

@@ -5,7 +5,6 @@ import org.openapitools.model.*;
 
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 
-import java.util.List;
 import org.openapitools.model.User;
 
 import java.util.List;

samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/UserApi.java

@@ -1,7 +1,6 @@
 package org.openapitools.api;
 
 import java.util.Date;
-import java.util.List;
 import org.openapitools.model.User;
 
 import java.io.InputStream;