Merge remote-tracking branch 'origin/master' into roxspring-feature/m…

…ulti-level-model-hierarchy * origin/master: minor fix to CI failure feat(dart-dio): correctly handle Map<String, Object>, List<Object> using JsonObject (OpenAPITools#4401) [OCAML] Fixes cloud.drone.io ocaml-test (OpenAPITools#4501) [elm] Add support for oneOf (OpenAPITools#4434) [BUG] [Java] Client resttemplate and webclient. Form Params are badly added when they are lists (OpenAPITools#4461) fix: prevent ClassCastException when handling options of (issue OpenAPITools#4468) (OpenAPITools#4495) Fixes Python client Configuration class so each instance uses its own dicts (OpenAPITools#4485)
jimschubert · Nov 17, 2019 · b6068af · b6068af
2 parents 53a1fa9 + 2f428e7
commit b6068af
Show file tree

Hide file tree

Showing 95 changed files with 2,091 additions and 475 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -139,6 +139,7 @@ script:
   - mvn clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml
   - mvn clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml
   - mvn clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml
+  - mvn clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml
   # test gradle plugin
   - (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk)
   - (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)

diff --git a/CI/.drone.yml b/CI/.drone.yml
@@ -29,12 +29,12 @@ steps:
   # generate all petstore samples (openapi3)
   - /bin/bash bin/openapi3/run-all-petstore
 # test ocaml petstore client
-#- name: ocaml-test
-#  image: ocaml/opam2:4.07
-#  commands:
-#  - sudo apt-get -y install m4
-#  - cd samples/client/petstore/ocaml
-#  - opam install ppx_deriving_yojson cohttp ppx_deriving cohttp-lwt-unix
-#  - eval $(opam env)
-#  - sudo chmod -R 777 .
-#  - dune build --build-dir=./_build
+- name: ocaml-test
+ image: ocaml/opam2:4.07
+ commands:
+ - sudo apt-get -y install m4
+ - cd samples/client/petstore/ocaml
+ - opam install ppx_deriving_yojson cohttp ppx_deriving cohttp-lwt-unix pin ocaml-migrate-parsetree 1.3.1
+ - eval $(opam env)
+ - sudo chmod -R 777 .
+ - dune build --build-dir=./_build
diff --git a/bin/openapi3/elm-all.sh b/bin/openapi3/elm-all.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+./bin/openapi3/elm-petstore.sh
+./bin/openapi3/elm-composition.sh
+
diff --git a/bin/openapi3/elm-composition.sh b/bin/openapi3/elm-composition.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B clean package
+fi
+
+# auto format elm code using elm-format
+export ELM_POST_PROCESS_FILE="/usr/bin/env elm-format --elm-version=0.19 --yes"
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -i modules/openapi-generator/src/test/resources/3_0/composition.yaml -g elm -t modules/openapi-generator/src/main/resources/elm -o samples/openapi3/client/composition/elm --enable-post-process-file $@"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/python-petstore-all.sh b/bin/python-petstore-all.sh
@@ -3,4 +3,5 @@
 
 ./bin/python-asyncio-petstore.sh
 ./bin/python-petstore.sh
+./bin/python-experimental-petstore.sh
 ./bin/python-tornado-petstore.sh
diff --git a/bin/springboot-petstore-server.sh b/bin/springboot-petstore-server.sh
@@ -27,7 +27,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate --artifact-id springboot -t modules/openapi-generator/src/main/resources/JavaSpring -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g spring -o samples/server/petstore/springboot --additional-properties hideGenerationTimestamp=true $@"
+ags="generate --artifact-id springboot -t modules/openapi-generator/src/main/resources/JavaSpring -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g spring -o samples/server/petstore/springboot --additional-properties hideGenerationTimestamp=true,snapshotVersion=true $@"
 
 echo "Removing files and folders under samples/server/petstore/springboot/src/main"
 rm -rf samples/server/petstore/springboot/src/main

diff --git a/modules/openapi-generator-maven-plugin/examples/spring.xml b/modules/openapi-generator-maven-plugin/examples/spring.xml
@@ -0,0 +1,126 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.openapitools</groupId>
+	<artifactId>sample-project</artifactId>
+	<packaging>jar</packaging>
+	<version>1.0-SNAPSHOT</version>
+	<name>sample-project</name>
+	<url>http://maven.apache.org</url>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.2.1.RELEASE</version>
+	</parent>
+	<build>
+		<plugins>
+			<!-- activate the plugin -->
+			<plugin>
+				<groupId>org.openapitools</groupId>
+				<artifactId>openapi-generator-maven-plugin</artifactId>
+				<!-- RELEASE_VERSION -->
+				<version>4.2.2-SNAPSHOT</version>
+				<!-- /RELEASE_VERSION -->
+				<executions>
+					<execution>
+						<id>spring-server</id>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<!-- specify the swagger yaml -->
+							<inputSpec>${project.basedir}/swagger.yaml</inputSpec>
+
+							<!-- target to generate java client code -->
+							<generatorName>spring</generatorName>
+
+							<!-- hint: if you want to generate java server code, e.g. based on Spring Boot,
+								 you can use the following target: <generatorName>spring</generatorName> -->
+
+							<!-- pass any necessary config options -->
+							<configOptions>
+								<serializableModel>true</serializableModel>
+								<snapshotVersion>true</snapshotVersion>
+							</configOptions>
+
+						</configuration>
+					</execution>
+
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+					<proc>none</proc>
+				</configuration>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+		</pluginManagement>
+	</build>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>sonatype-snapshots</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+		</pluginRepository>
+	</pluginRepositories>
+	<dependencies>
+		<!-- dependencies are needed for the client being generated -->
+
+		<dependency>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-annotations</artifactId>
+			<version>${swagger-annotations-version}</version>
+		</dependency>
+
+		<!-- You can find the dependencies for the library configuation you chose by looking in JavaClientCodegen.
+			 Then find the corresponding dependency on Maven Central, and set the versions in the property section below -->
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<!--SpringFox dependencies -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>${springfox-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>${springfox-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.2.11</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.openapitools</groupId>
+			<artifactId>jackson-databind-nullable</artifactId>
+			<version>0.1.0</version>
+		</dependency>
+		<!-- Bean Validation API support -->
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+		</dependency>
+	</dependencies>
+
+	<properties>
+		<swagger-annotations-version>1.5.8</swagger-annotations-version>
+
+		<spring-boot-starter-web.version>2.2.1.RELEASE</spring-boot-starter-web.version>
+		<springfox-version>2.8.0</springfox-version>
+	</properties>
+</project>
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
@@ -4399,14 +4399,9 @@ public String addRegularExpressionDelimiter(String pattern) {
      * @return property value as boolean
      */
     public boolean convertPropertyToBooleanAndWriteBack(String propertyKey) {
-        boolean booleanValue = false;
-        if (additionalProperties.containsKey(propertyKey)) {
-            booleanValue = convertPropertyToBoolean(propertyKey);
-            // write back as boolean
-            writePropertyBack(propertyKey, booleanValue);
-        }
-
-        return booleanValue;
+        boolean result = convertPropertyToBoolean(propertyKey);
+        writePropertyBack(propertyKey, result);
+        return result;
     }
 
     /**
@@ -4430,12 +4425,14 @@ public void setIgnoreFilePathOverride(final String ignoreFileOverride) {
     }
 
     public boolean convertPropertyToBoolean(String propertyKey) {
-        boolean booleanValue = false;
-        if (additionalProperties.containsKey(propertyKey)) {
-            booleanValue = Boolean.valueOf(additionalProperties.get(propertyKey).toString());
+        final Object booleanValue = additionalProperties.get(propertyKey);
+        Boolean result = Boolean.FALSE;
+        if (booleanValue instanceof Boolean) {
+            result = (Boolean) booleanValue;
+        } else if (booleanValue instanceof String) {
+            result = Boolean.parseBoolean((String) booleanValue);
         }
-
-        return booleanValue;
+        return result;
     }
 
     public void writePropertyBack(String propertyKey, boolean value) {

diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -1055,8 +1055,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
         }
 
         if (additionalProperties.containsKey(CodegenConstants.SNAPSHOT_VERSION)) {
-            Boolean useSnapshotVersion = Boolean.valueOf((String) additionalProperties.get(CodegenConstants.SNAPSHOT_VERSION));
-            if (useSnapshotVersion) {
+            if (convertPropertyToBooleanAndWriteBack(CodegenConstants.SNAPSHOT_VERSION)) {
                 this.setArtifactVersion(this.buildSnapshotVersion(this.getArtifactVersion()));
             }
         }

diff --git a/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
@@ -434,19 +434,19 @@ public void processOpts() {
         }
 
         if (additionalProperties.containsKey(CodegenConstants.SERIALIZABLE_MODEL)) {
-            this.setSerializableModel(getBooleanOption(CodegenConstants.SERIALIZABLE_MODEL));
+            this.setSerializableModel(convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL));
         } else {
             additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, serializableModel);
         }
 
         if (additionalProperties.containsKey(CodegenConstants.PARCELIZE_MODELS)) {
-            this.setParcelizeModels(getBooleanOption(CodegenConstants.PARCELIZE_MODELS));
+            this.setParcelizeModels(convertPropertyToBooleanAndWriteBack(CodegenConstants.PARCELIZE_MODELS));
         } else {
             additionalProperties.put(CodegenConstants.PARCELIZE_MODELS, parcelizeModels);
         }
 
         if (additionalProperties.containsKey(CodegenConstants.NON_PUBLIC_API)) {
-            this.setNonPublicApi(getBooleanOption(CodegenConstants.NON_PUBLIC_API));
+            this.setNonPublicApi(convertPropertyToBooleanAndWriteBack(CodegenConstants.NON_PUBLIC_API));
         } else {
             additionalProperties.put(CodegenConstants.NON_PUBLIC_API, nonPublicApi);
         }
@@ -458,18 +458,6 @@ public void processOpts() {
         additionalProperties.put("modelDocPath", modelDocPath);
     }
 
-    private boolean getBooleanOption(String key) {
-        final Object booleanValue = additionalProperties.get(key);
-        Boolean result = Boolean.FALSE;
-        if (booleanValue instanceof Boolean) {
-            result = (Boolean) booleanValue;
-        } else if (booleanValue instanceof String) {
-            result = Boolean.parseBoolean((String) booleanValue);
-        }
-        additionalProperties.put(key, result);
-        return result;
-    }
-
     public void setArtifactId(String artifactId) {
         this.artifactId = artifactId;
     }

diff --git a/...napi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java b/...napi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java
@@ -80,6 +80,7 @@ public DartDioClientCodegen() {
 
         importMapping.put("BuiltList", "package:built_collection/built_collection.dart");
         importMapping.put("BuiltMap", "package:built_collection/built_collection.dart");
+        importMapping.put("JsonObject", "package:built_value/json_object.dart");
         importMapping.put("Uint8List", "dart:typed_data");
     }
 
@@ -129,6 +130,13 @@ public String toEnumVarName(String name, String datatype) {
         return name;
     }
 
+    @Override
+    protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) {
+        //super.addAdditionPropertiesToCodeGenModel(codegenModel, schema);
+        codegenModel.additionalPropertiesType = getSchemaType(ModelUtils.getAdditionalProperties(schema));
+        addImport(codegenModel, codegenModel.additionalPropertiesType);
+    }
+
     @Override
     public void processOpts() {
         if (StringUtils.isEmpty(System.getenv("DART_POST_PROCESS_FILE"))) {
@@ -230,9 +238,16 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert
             //Updates any List properties on a model to a BuiltList. This happens in post processing rather
             //than type mapping as we only want this to apply to models, not every other class.
             if ("List".equals(property.baseType)) {
-                property.setDatatype(property.dataType.replaceAll(property.baseType, "BuiltList"));
+                property.setDatatype(
+                    property.dataType.replaceAll(property.baseType, "BuiltList"));
                 property.setBaseType("BuiltList");
                 model.imports.add("BuiltList");
+                if ("Object".equals(property.items.baseType)) {
+                    property.setDatatype(
+                        property.dataType.replaceAll("Object", "JsonObject"));
+                    property.items.setDatatype("JsonObject");
+                    model.imports.add("JsonObject");
+                }
             }
         }
         if (property.isMapContainer) {
@@ -242,6 +257,11 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert
                 property.setDatatype(property.dataType.replaceAll(property.baseType, "BuiltMap"));
                 property.setBaseType("BuiltMap");
                 model.imports.add("BuiltMap");
+                if ("Object".equals(property.items.baseType)) {
+                    property.setDatatype(property.dataType.replaceAll("Object", "JsonObject"));
+                    property.items.setDatatype("JsonObject");
+                    model.imports.add("JsonObject");
+                }
             }
         }
 

diff --git a/.../openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java b/.../openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java
@@ -373,7 +373,13 @@ public int compare(CodegenModel cm1, CodegenModel cm2) {
                         elmImports.add(elmImport);
                     }
                 }
-                if (cm.discriminator != null) {
+                if (cm.oneOf != null) {
+                    for (String variant : cm.oneOf) {
+                        final ElmImport elmImport = createImport(variant);
+                        elmImports.add(elmImport);
+                    }
+                }
+                if (cm.discriminator != null && cm.children != null) {
                     for (CodegenModel child : cm.children) {
                         // add child imports
                         final ElmImport elmImport = createImport(child.classname);

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache
@@ -116,7 +116,7 @@ public class {{classname}} {
         final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
         final HttpHeaders headerParams = new HttpHeaders();
         final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
-        final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();{{#hasQueryParams}}
+        final MultiValueMap formParams = new LinkedMultiValueMap();{{#hasQueryParams}}
 
         {{#queryParams}}queryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}}));{{#hasMore}}
         {{/hasMore}}{{/queryParams}}{{/hasQueryParams}}{{#hasHeaderParams}}
@@ -130,7 +130,7 @@ public class {{classname}} {
         {{/hasMore}}{{/cookieParams}}{{/hasCookieParams}}{{#hasFormParams}}
 
         {{#formParams}}if ({{paramName}} != null)
-            formParams.add("{{baseName}}", {{#isFile}}new FileSystemResource({{paramName}}){{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{#hasMore}}
+            formParams.{{^collectionFormat}}add{{/collectionFormat}}{{#collectionFormat}}put{{/collectionFormat}}("{{baseName}}", {{#isFile}}new FileSystemResource({{paramName}}){{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{#hasMore}}
         {{/hasMore}}{{/formParams}}{{/hasFormParams}}
 
         final String[] accepts = { {{#hasProduces}}

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache
@@ -88,7 +88,7 @@ public class {{classname}} {
         {{/hasMore}}{{/cookieParams}}{{/hasCookieParams}}{{#hasFormParams}}
 
         {{#formParams}}if ({{paramName}} != null)
-            formParams.add("{{baseName}}", {{#isFile}}new FileSystemResource({{paramName}}){{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{#hasMore}}
+            formParams.add{{#collectionFormat}}All{{/collectionFormat}}("{{baseName}}", {{#isFile}}new FileSystemResource({{paramName}}){{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{#hasMore}}
         {{/hasMore}}{{/formParams}}{{/hasFormParams}}
 
         final String[] accepts = { {{#hasProduces}}