use ignore import mapping as an option, default true for java generators

Author: HugoMario

src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java

@@ -171,6 +171,7 @@ public abstract class DefaultCodegenConfig implements CodegenConfig {
     protected String ignoreFilePathOverride;
     protected boolean useOas2 = false;
     protected boolean copyFistAllOfProperties = false;
+    protected boolean ignoreImportMapping;
 
     public List<CliOption> cliOptions() {
         return cliOptions;
@@ -181,6 +182,12 @@ public void processOpts() {
             this.setTemplateDir((String) additionalProperties.get(CodegenConstants.TEMPLATE_DIR));
         }
 
+        if (additionalProperties.get(CodegenConstants.IGNORE_IMPORT_MAPPING_OPTION) != null) {
+            setIgnoreImportMapping(Boolean.parseBoolean( additionalProperties.get(CodegenConstants.IGNORE_IMPORT_MAPPING_OPTION).toString()));
+        } else {
+            setIgnoreImportMapping(defaultIgnoreImportMappingOption());
+        }
+
         if (additionalProperties.containsKey(CodegenConstants.TEMPLATE_VERSION)) {
             this.setTemplateVersion((String) additionalProperties.get(CodegenConstants.TEMPLATE_VERSION));
         }
@@ -4264,7 +4271,15 @@ public void setUnflattenedOpenAPI(OpenAPI unflattenedOpenAPI) {
         this.unflattenedOpenAPI = unflattenedOpenAPI;
     }
 
-    public boolean ignoreImportMapping() {
+    public boolean getIgnoreImportMapping() {
+        return ignoreImportMapping;
+    }
+
+    public void setIgnoreImportMapping(boolean ignoreImportMapping) {
+        this.ignoreImportMapping = ignoreImportMapping;
+    }
+
+    public boolean defaultIgnoreImportMappingOption() {
         return false;
     }
 }

src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaCodegen.java

@@ -598,6 +598,13 @@ public String toParamName(String name) {
 
     @Override
     public String toModelName(final String name) {
+        // We need to check if import-mapping has a different model for this class, so we use it
+        // instead of the auto-generated one.
+        System.out.println("getIgnoreImportMapping() => " + getIgnoreImportMapping());
+
+        if (!getIgnoreImportMapping() && importMapping.containsKey(name)) {
+            return importMapping.get(name);
+        }
         final String sanitizedName = sanitizeName(name);
 
         String nameWithPrefixSuffix = sanitizedName;
@@ -1445,7 +1452,7 @@ public void setLanguageArguments(List<CodegenArgument> languageArguments) {
     }
 
     @Override
-    public boolean ignoreImportMapping() {
+    public boolean defaultIgnoreImportMappingOption() {
         return true;
     }
 }

src/test/java/io/swagger/codegen/v3/generators/java/JavaClientCodegenTest.java

@@ -272,6 +272,7 @@ public void customTemplates() throws Exception {
     public void testModelNamedFile() {
         final OpenAPI openAPI = getOpenAPI("3_0_0/model_named_file.yaml");
         final CodegenConfig config = new JavaClientCodegen();
+        config.setIgnoreImportMapping(true);
         config.preprocessOpenAPI(openAPI);
 
         final Schema modelFile = openAPI.getComponents().getSchemas().get("File");
@@ -285,7 +286,7 @@ public void testModelNamedFile() {
 
         final List<CodegenProperty> codegenProperties = codegenModelSetting.getVars();
 
-        Assert.assertEquals(codegenProperties.size(), 2);
+        Assert.assertEquals(codegenProperties.size(), 4);
 
         CodegenProperty fileProperty = codegenProperties.stream().filter(property -> property.name.equals("file")).findAny().get();