OpenAPITools · wing328 · Feb 12, 2021 · Jul 12, 2020 · Jul 20, 2020 · Jul 26, 2020
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/model.mustache
@@ -46,7 +46,6 @@ import javax.validation.Valid;
 {{#performBeanValidation}}
 import org.hibernate.validator.constraints.*;
 {{/performBeanValidation}}
-import {{invokerPackage}}.JSON;
 
 {{#models}}
 {{#model}}

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache
@@ -1,3 +1,6 @@
+{{#discriminator}}
+import {{invokerPackage}}.JSON;
+{{/discriminator}}
 /**
  * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
  */{{#description}}

diff --git a/.../openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/.../openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
@@ -446,6 +446,38 @@ public void testJdkHttpClient() throws Exception {
                 "import java.net.http.HttpRequest;");
     }
 
+    @Test
+    public void testJdkHttpClientWithAndWithoutDiscriminator() throws Exception {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(CodegenConstants.API_PACKAGE, "xyz.abcdef.api");
+        properties.put(CodegenConstants.MODEL_PACKAGE, "xyz.abcdef.model");
+        properties.put(CodegenConstants.INVOKER_PACKAGE, "xyz.abcdef.invoker");
+
+        File output = Files.createTempDirectory("test").toFile();
+        output.deleteOnExit();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("java")
+                .setLibrary(JavaClientCodegen.NATIVE)
+                .setAdditionalProperties(properties)
+                .setInputSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+        DefaultGenerator generator = new DefaultGenerator();
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true");
+        generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true");
+        List<File> files = generator.opts(clientOptInput).generate();
+
+        Assert.assertEquals(files.size(), 156);
+        validateJavaSourceFiles(files);
+
+        TestUtils.assertFileContains(Paths.get(output + "/src/main/java/xyz/abcdef/model/Dog.java"),
+                "import xyz.abcdef.invoker.JSON;");
+        TestUtils.assertFileNotContains(Paths.get(output + "/src/main/java/xyz/abcdef/model/DogAllOf.java"),
+                "import xyz.abcdef.invoker.JSON;");
+    }
+
     @Test
     public void testJdkHttpAsyncClient() throws Exception {
         Map<String, Object> properties = new HashMap<>();

diff --git a/...native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/...native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -31,7 +31,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...a/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/...a/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -32,7 +32,6 @@
 import java.util.List;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/...native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -31,7 +31,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...a/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/...a/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -29,7 +29,6 @@
 import java.util.List;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/...native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -31,7 +31,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/.../native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/.../native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -32,7 +32,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/.../native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/.../native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -31,7 +31,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/.../native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/.../native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -31,7 +31,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java b/...client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java
@@ -30,9 +30,9 @@
 import org.openapitools.client.model.Cat;
 import org.openapitools.client.model.Dog;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
+import org.openapitools.client.JSON;
 /**
  * Animal
  */

diff --git a/...va/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/...va/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -28,7 +28,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...tore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/...tore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -28,7 +28,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...ent/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java b/...ent/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -28,7 +28,6 @@
 import java.util.List;
 import org.openapitools.client.model.ReadOnlyFirst;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BigCat.java b/...client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BigCat.java
@@ -29,9 +29,9 @@
 import org.openapitools.client.model.BigCatAllOf;
 import org.openapitools.client.model.Cat;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
+import org.openapitools.client.JSON;
 /**
  * BigCat
  */

diff --git a/...t/petstore/java/native-async/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/...t/petstore/java/native-async/src/main/java/org/openapitools/client/model/BigCatAllOf.java
@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...etstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java b/...etstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...es/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java b/...es/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java
@@ -30,9 +30,9 @@
 import org.openapitools.client.model.BigCat;
 import org.openapitools.client.model.CatAllOf;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
+import org.openapitools.client.JSON;
 /**
  * Cat
  */

diff --git a/...ient/petstore/java/native-async/src/main/java/org/openapitools/client/model/CatAllOf.java b/...ient/petstore/java/native-async/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...ient/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java b/...ient/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java
@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...nt/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java b/...nt/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java b/...client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java
@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...es/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java b/...es/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java
@@ -29,9 +29,9 @@
 import org.openapitools.client.model.Animal;
 import org.openapitools.client.model.DogAllOf;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
+import org.openapitools.client.JSON;
 /**
  * Dog
  */

diff --git a/...ient/petstore/java/native-async/src/main/java/org/openapitools/client/model/DogAllOf.java b/...ient/petstore/java/native-async/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...nt/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java b/...nt/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -27,7 +27,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...ent/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumClass.java b/...ent/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumClass.java
@@ -18,7 +18,6 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 import com.fasterxml.jackson.annotation.JsonCreator;

diff --git a/...ient/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java b/...ient/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -26,7 +26,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.OuterEnum;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...re/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/...re/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -27,7 +27,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...nt/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java b/...nt/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -30,7 +30,6 @@
 import java.time.OffsetDateTime;
 import java.util.UUID;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...tstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/...tstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...lient/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java b/...lient/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java
@@ -28,7 +28,6 @@
 import java.util.List;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/.../main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/.../main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -31,7 +31,6 @@
 import java.util.UUID;
 import org.openapitools.client.model.Animal;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...store/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java b/...store/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...store/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/...store/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...t/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java b/...t/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...s/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java b/...s/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java
@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...nt/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java b/...nt/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -26,7 +26,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/.../client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java b/.../client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java
@@ -26,7 +26,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...etstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java b/...etstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -26,7 +26,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...ent/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnum.java b/...ent/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnum.java
@@ -18,7 +18,6 @@
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 import com.fasterxml.jackson.annotation.JsonCreator;

diff --git a/...es/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java b/...es/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java
@@ -31,7 +31,6 @@
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...petstore/java/native-async/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/...petstore/java/native-async/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**

diff --git a/...store/java/native-async/src/main/java/org/openapitools/client/model/SpecialModelName.java b/...store/java/native-async/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -25,7 +25,6 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openapitools.client.JSON;
 
 
 /**