loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[core] Remove java specific imports from DefaultCodegen (#7763)

Browse Source
This commit is contained in:
Jim Schubert 2020-10-22 05:43:17 -04:00 committed by GitHub
parent 50f3706c5c
commit a5aeb5fdec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/generators/android.md
View File

@ -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|

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

@ -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

19
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
View File

@ -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()));

1
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
View File

@ -72,7 +72,6 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
public AbstractKotlinCodegen() {
super();
super.loadJVMSpecificImportMappers();
supportsInheritance = true;
setSortModelPropertiesByRequiredFlag(true);

1
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
View File

@ -58,7 +58,6 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
public AbstractScalaCodegen() {
super();
super.loadJVMSpecificImportMappers();
languageSpecificPrimitives.addAll(Arrays.asList(
"String",

13
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java
View File

@ -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));

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

@ -41,7 +41,6 @@ public class GroovyClientCodegen extends AbstractJavaCodegen {
public GroovyClientCodegen() {
super();
super.loadJVMSpecificImportMappers();
modifyFeatureSet(features -> features
.includeDocumentationFeatures(DocumentationFeature.Readme)