[Java][Spring] fix one of

.gitignore

@@ -62,14 +62,17 @@ samples/server-generator/node/output/node_modules
 samples/server/petstore/nodejs/node_modules
 samples/server/petstore/nodejs-server/node_modules
 
-# qt5 cpp
-*.pro.user
-samples/client/petstore/qt5cpp/PetStore/moc_*
-samples/client/petstore/qt5cpp/PetStore/*.o
-samples/client/petstore/qt5cpp/build-*
-samples/client/petstore/qt5cpp/PetStore/PetStore
-samples/client/petstore/qt5cpp/PetStore/Makefile
-samples/client/petstore/qt5cpp/PetStore/PetStore.pro.user
+# qt cpp
+samples/client/build
+samples/client/petstore/build
+samples/client/petstore/cpp-qt/PetStore/moc_*
+samples/client/petstore/cpp-qt/PetStore/*.o
+samples/client/petstore/cpp-qt/build-*
+samples/client/petstore/cpp-qt/build-*
+samples/client/petstore/cpp-qt/PetStore/PetStore
+samples/client/petstore/cpp-qt/PetStore/Makefile
+samples/client/petstore/cpp-qt/PetStore/PetStore.pro.user
+samples/client/petstore/cpp-qt/CMakeLists.txt.user
 
 # cpprestsdk
 samples/client/petstore/cpp-restsdk/CMakeCache.txt

CI/.drone.yml

@@ -1,4 +1,5 @@
 kind: pipeline
+type: docker
 name: default
 steps:
 # test Java 11 HTTP client
@@ -15,11 +16,23 @@ steps:
   - /bin/bash bin/utils/test-fake-petstore-for-all.sh
   # generate test scripts
   - /bin/bash bin/tests/run-all-test
+
+---
+kind: pipeline
+type: docker
+name: default
+steps:
 # test nim client
 - name: nim-client-test
   image: nimlang/nim
   commands:
   - (cd samples/client/petstore/nim/ && nim c sample_client.nim)
+
+---
+kind: pipeline
+type: docker
+name: default
+steps:
 # test protobuf schema generator
 - name: protobuf-schema-test
   image: nanoservice/protobuf-go
@@ -29,12 +42,24 @@ steps:
   - cd samples/config/petstore/protobuf-schema
   - protoc --go_out=/var/tmp/go/ services/*
   - protoc --go_out=/var/tmp/go/ models/*
+
+---
+kind: pipeline
+type: docker
+name: default
+steps:
 # test aspnetcore 3.x
 - name: aspnetcore-test
   image: mcr.microsoft.com/dotnet/core/sdk:3.1
   commands:
   - (cd samples/server/petstore/aspnetcore-3.1/ && /bin/sh build.sh)
   - (cd samples/server/petstore/aspnetcore-3.0/ && /bin/sh build.sh)
+
+---
+kind: pipeline
+type: docker
+name: default
+steps:
 # test ocaml petstore client
 - name: ocaml-test
   image: ocaml/opam2:4.07
@@ -46,11 +71,23 @@ steps:
   - eval $(opam env)
   - sudo chmod -R 777 .
   - dune build --build-dir=./_build
+
+---
+kind: pipeline
+type: docker
+name: default
+steps:
 # test haskell client
 - name: haskell-client-test
-  image: haskell:8.6.5
+  image: haskell:8.10.4
   commands:
   - (cd samples/client/petstore/haskell-http-client/ && stack --allow-different-user --install-ghc --no-haddock-deps haddock --fast && stack --allow-different-user test --fast)
+
+---
+kind: pipeline
+type: docker
+name: default
+steps:
 # test erlang client and server
 - name: erlang
   image: erlang:alpine

bin/configs/haskell-http-client.yaml

@@ -2,3 +2,5 @@ generatorName: haskell-http-client
 outputDir: samples/client/petstore/haskell-http-client
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/haskell-http-client
+additionalProperties:
+    queryExtraUnreserved: ''

bin/configs/swift5-resultLibrary.yaml

@@ -9,3 +9,4 @@ additionalProperties:
   podSummary: PetstoreClient
   projectName: PetstoreClient
   podHomepage: https://github.com/openapitools/openapi-generator
+  removeMigrationProjectNameClass: true

docs/generators/haskell-http-client.md

@@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelDeriving|Additional classes to include in the deriving() clause of Models| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
+|queryExtraUnreserved|Configures additional querystring characters which must not be URI encoded, e.g. '+' or ':'| |null|
 |requestType|Set the name of the type used to generate requests| |null|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|

docs/generators/scala-akka-http-server.md

@@ -61,6 +61,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scala-akka.md

@@ -56,6 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scala-gatling.md

@@ -56,6 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scala-httpclient-deprecated.md

@@ -56,6 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scala-lagom-server.md

@@ -56,6 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scala-play-server.md

@@ -64,6 +64,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scala-sttp.md

@@ -62,6 +62,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scalatra.md

@@ -57,6 +57,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/scalaz.md

@@ -56,6 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>Any</li>
 <li>Array</li>
 <li>Boolean</li>
+<li>Byte</li>
 <li>Double</li>
 <li>Float</li>
 <li>Int</li>

docs/generators/swift5.md

@@ -33,6 +33,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |projectName|Project name in Xcode| |null|
 |readonlyProperties|Make properties readonly (default: false)| |null|
+|removeMigrationProjectNameClass|Make properties removeMigrationProjectNameClass (default: false)| |null|
 |responseAs|Optionally use libraries to manage response.  Currently PromiseKit, RxSwift, Result, Combine are available.| |null|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|

modules/openapi-generator-gradle-plugin/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.20'
+    ext.kotlin_version = '1.3.30'
     repositories {
         mavenLocal()
         maven { url "https://repo1.maven.org/maven2" }

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

@@ -34,6 +34,10 @@
 import java.util.Set;
 
 public interface CodegenConfig {
+    String getFilesMetadataFilename();
+
+    String getVersionMetadataFilename();
+
     GeneratorMetadata getGeneratorMetadata();
 
     CodegenType getTag();

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

@@ -152,6 +152,8 @@ public class DefaultCodegen implements CodegenConfig {
     protected String modelNamePrefix = "", modelNameSuffix = "";
     protected String apiNamePrefix = "", apiNameSuffix = "Api";
     protected String testPackage = "";
+    protected String filesMetadataFilename = "FILES";
+    protected String versionMetadataFilename = "VERSION";
     /*
     apiTemplateFiles are for API outputs only (controllers/handlers).
     API templates may be written multiple times; APIs are grouped by tag and the file is written once per tag group.
@@ -1177,6 +1179,24 @@ public void setInputSpec(String inputSpec) {
         this.inputSpec = inputSpec;
     }
 
+    @Override
+    public String getFilesMetadataFilename() {
+        return filesMetadataFilename;
+    }
+
+    public void setFilesMetadataFilename(String filesMetadataFilename) {
+        this.filesMetadataFilename = filesMetadataFilename;
+    }
+
+    @Override
+    public String getVersionMetadataFilename() {
+        return versionMetadataFilename;
+    }
+
+    public void setVersionMetadataFilename(String versionMetadataFilename) {
+        this.versionMetadataFilename = versionMetadataFilename;
+    }
+
     public void setTemplateDir(String templateDir) {
         this.templateDir = templateDir;
     }
@@ -1560,6 +1580,7 @@ public DefaultCodegen() {
         typeMapping.put("char", "String");
         typeMapping.put("object", "Object");
         typeMapping.put("integer", "Integer");
+        // FIXME: java specific type should be in Java Based Abstract Impl's
         typeMapping.put("ByteArray", "byte[]");
         typeMapping.put("binary", "File");
         typeMapping.put("file", "File");
@@ -2403,6 +2424,18 @@ public CodegenModel fromModel(String name, Schema schema) {
         m.isAlias = (typeAliases.containsKey(name)
                 || isAliasOfSimpleTypes(schema)); // check if the unaliased schema is an alias of simple OAS types
         m.setDiscriminator(createDiscriminator(name, schema, this.openAPI));
+        if (ModelUtils.isComposedSchema(schema)
+                && m.discriminator == null
+                && schema.getExtensions() != null
+                && schema.getExtensions().containsKey("x-one-of-name")) {
+            m.vendorExtensions.put("x-deduction", true);
+            List<String> deductionModelNames = new ArrayList<>();
+            ((ComposedSchema) schema).getOneOf().forEach(model -> {
+                String modelName = ModelUtils.getSimpleRef(model.get$ref());
+                deductionModelNames.add(toModelName(modelName));
+            });
+            m.vendorExtensions.put("x-deduction-model-names", deductionModelNames);
+        }
         if (!this.getLegacyDiscriminatorBehavior()) {
             m.addDiscriminatorMappedModelsImports();
         }
@@ -3144,7 +3177,7 @@ protected CodegenDiscriminator createDiscriminator(String schemaName, Schema sch
             }
         }
         // if there are composed oneOf/anyOf schemas, add them to this discriminator
-        if (ModelUtils.isComposedSchema(schema) && !this.getLegacyDiscriminatorBehavior()) {
+        if (ModelUtils.isComposedSchema(schema)) {
             List<MappedModel> otherDescendants = getOneOfAnyOfDescendants(schemaName, discPropName, (ComposedSchema) schema, openAPI);
             for (MappedModel otherDescendant : otherDescendants) {
                 if (!uniqueDescendants.contains(otherDescendant)) {

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

@@ -1427,7 +1427,7 @@ private List<CodegenSecurity> filterAuthMethods(List<CodegenSecurity> authMethod
      * @param files The list tracking generated files
      */
     private void generateVersionMetadata(List<File> files) {
-        String versionMetadata = config.outputFolder() + File.separator + METADATA_DIR + File.separator + "VERSION";
+        String versionMetadata = config.outputFolder() + File.separator + METADATA_DIR + File.separator + config.getVersionMetadataFilename();
         if (generateMetadata) {
             File versionMetadataFile = new File(versionMetadata);
             try {
@@ -1495,7 +1495,7 @@ private void generateFilesMetadata(List<File> files) {
                     }
                 });
 
-                String targetFile = config.outputFolder() + File.separator + METADATA_DIR + File.separator + "FILES";
+                String targetFile = config.outputFolder() + File.separator + METADATA_DIR + File.separator + config.getFilesMetadataFilename();
 
                 File filesFile = this.templateProcessor.writeToFile(targetFile, sb.toString().getBytes(StandardCharsets.UTF_8));
                 if (filesFile != null) {