From a5aeb5fdec74e9d3db35d95e017d7d67a33b1dde Mon Sep 17 00:00:00 2001 From: Jim Schubert Date: Thu, 22 Oct 2020 05:43:17 -0400 Subject: [PATCH] [core] Remove java specific imports from DefaultCodegen (#7763) --- docs/generators/android.md | 6 ------ .../openapitools/codegen/DefaultCodegen.java | 20 ------------------- .../languages/AbstractJavaCodegen.java | 19 +++++++++++++++++- .../languages/AbstractKotlinCodegen.java | 1 - .../languages/AbstractScalaCodegen.java | 1 - .../languages/AndroidClientCodegen.java | 13 +++++++++++- .../languages/GroovyClientCodegen.java | 1 - 7 files changed, 30 insertions(+), 31 deletions(-) diff --git a/docs/generators/android.md b/docs/generators/android.md index 6173d90e89d..efe7dc790b1 100644 --- a/docs/generators/android.md +++ b/docs/generators/android.md @@ -36,17 +36,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ArrayList|java.util.ArrayList| |BigDecimal|java.math.BigDecimal| |Date|java.util.Date| -|DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| -|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| -|LocalDate|org.joda.time.*| -|LocalDateTime|org.joda.time.*| -|LocalTime|org.joda.time.*| |Map|java.util.Map| |Set|java.util.*| -|Timestamp|java.sql.Timestamp| |URI|java.net.URI| |UUID|java.util.UUID| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 97feb4238ad..45e88b15fbc 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -1844,26 +1844,6 @@ public class DefaultCodegen implements CodegenConfig { } } - protected void loadJVMSpecificImportMappers() { - importMapping.put("BigDecimal", "java.math.BigDecimal"); - importMapping.put("UUID", "java.util.UUID"); - importMapping.put("URI", "java.net.URI"); - importMapping.put("File", "java.io.File"); - importMapping.put("Date", "java.util.Date"); - importMapping.put("Timestamp", "java.sql.Timestamp"); - importMapping.put("Map", "java.util.Map"); - importMapping.put("HashMap", "java.util.HashMap"); - importMapping.put("Array", "java.util.List"); - importMapping.put("ArrayList", "java.util.ArrayList"); - importMapping.put("List", "java.util.*"); - importMapping.put("Set", "java.util.*"); - importMapping.put("LinkedHashSet", "java.util.LinkedHashSet"); - importMapping.put("DateTime", "org.joda.time.*"); - importMapping.put("LocalDateTime", "org.joda.time.*"); - importMapping.put("LocalDate", "org.joda.time.*"); - importMapping.put("LocalTime", "org.joda.time.*"); - } - /** * Return the property initialized from a data object * Useful for initialization with a plain object in Javascript diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 232c62adbe5..2ebc0fc251e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -108,7 +108,6 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code public AbstractJavaCodegen() { super(); - super.loadJVMSpecificImportMappers(); modifyFeatureSet(features -> features .includeDocumentationFeatures(DocumentationFeature.Readme) @@ -179,6 +178,24 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code typeMapping.put("file", "File"); typeMapping.put("AnyType", "Object"); + importMapping.put("BigDecimal", "java.math.BigDecimal"); + importMapping.put("UUID", "java.util.UUID"); + importMapping.put("URI", "java.net.URI"); + importMapping.put("File", "java.io.File"); + importMapping.put("Date", "java.util.Date"); + importMapping.put("Timestamp", "java.sql.Timestamp"); + importMapping.put("Map", "java.util.Map"); + importMapping.put("HashMap", "java.util.HashMap"); + importMapping.put("Array", "java.util.List"); + importMapping.put("ArrayList", "java.util.ArrayList"); + importMapping.put("List", "java.util.*"); + importMapping.put("Set", "java.util.*"); + importMapping.put("LinkedHashSet", "java.util.LinkedHashSet"); + importMapping.put("DateTime", "org.joda.time.*"); + importMapping.put("LocalDateTime", "org.joda.time.*"); + importMapping.put("LocalDate", "org.joda.time.*"); + importMapping.put("LocalTime", "org.joda.time.*"); + cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC).defaultValue(this.getInvokerPackage())); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java index 6ff7204c195..a8e8f24feb4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java @@ -72,7 +72,6 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co public AbstractKotlinCodegen() { super(); - super.loadJVMSpecificImportMappers(); supportsInheritance = true; setSortModelPropertiesByRequiredFlag(true); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java index 28dc6bd200a..6f87d96f13e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java @@ -58,7 +58,6 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen { public AbstractScalaCodegen() { super(); - super.loadJVMSpecificImportMappers(); languageSpecificPrimitives.addAll(Arrays.asList( "String", diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java index ea1914fe383..3f87fcc77c3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java @@ -59,7 +59,6 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi public AndroidClientCodegen() { super(); - super.loadJVMSpecificImportMappers(); // TODO: Android client maintainer review. modifyFeatureSet(features -> features @@ -135,6 +134,18 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi typeMapping.put("date", "Date"); typeMapping.put("file", "File"); + importMapping.put("BigDecimal", "java.math.BigDecimal"); + importMapping.put("UUID", "java.util.UUID"); + importMapping.put("URI", "java.net.URI"); + importMapping.put("File", "java.io.File"); + importMapping.put("Date", "java.util.Date"); + importMapping.put("Map", "java.util.Map"); + importMapping.put("HashMap", "java.util.HashMap"); + importMapping.put("Array", "java.util.List"); + importMapping.put("ArrayList", "java.util.ArrayList"); + importMapping.put("List", "java.util.*"); + importMapping.put("Set", "java.util.*"); + cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC)); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java index 34583c5194e..77844538e47 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java @@ -41,7 +41,6 @@ public class GroovyClientCodegen extends AbstractJavaCodegen { public GroovyClientCodegen() { super(); - super.loadJVMSpecificImportMappers(); modifyFeatureSet(features -> features .includeDocumentationFeatures(DocumentationFeature.Readme)