allow models named file and other utils default java classes.

Author: HugoMario

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

@@ -1717,6 +1717,9 @@ public CodegenProperty fromProperty(String name, Schema propertySchema) {
             CodegenProperty cp = fromProperty("inner", new ObjectSchema());
             updatePropertyForMap(codegenProperty, cp);
         } else {
+            if (isObjectSchema(propertySchema)) {
+                codegenProperty.getVendorExtensions().put("x-is-object", Boolean.TRUE);
+            }
             setNonArrayMapProperty(codegenProperty, type);
         }
         return codegenProperty;
@@ -3147,6 +3150,26 @@ private void addVars(CodegenModel codegenModel, List<CodegenProperty> vars, Map<
                 codegenModel.readWriteVars.add(codegenProperty);
             }
         }
+        // check if one of the property is a object and has import mapping.
+        List<CodegenProperty> modelProperties = vars.stream()
+                .filter(codegenProperty -> getBooleanValue(codegenProperty, "x-is-object") && importMapping.containsKey(codegenProperty.baseType))
+                .collect(Collectors.toList());
+
+        for (CodegenProperty modelProperty : modelProperties) {
+            List<CodegenProperty> codegenProperties = vars.stream()
+                    .filter(codegenProperty -> !getBooleanValue(codegenProperty, "x-is-object")
+                            && importMapping.containsKey(codegenProperty.baseType)
+                            && codegenProperty.baseType.equals(modelProperty.baseType))
+                    .collect(Collectors.toList());
+            if (codegenProperties == null || codegenProperties.isEmpty()) {
+                continue;
+            }
+            for (CodegenProperty codegenProperty : codegenProperties) {
+                codegenModel.imports.remove(codegenProperty.baseType);
+                codegenProperty.datatype = importMapping.get(codegenProperty.baseType);
+                codegenProperty.datatypeWithEnum = codegenProperty.datatype;
+            }
+        }
     }
 
     /**

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

@@ -598,12 +598,6 @@ 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.
-        if (importMapping.containsKey(name)) {
-            return importMapping.get(name);
-        }
-
         final String sanitizedName = sanitizeName(name);
 
         String nameWithPrefixSuffix = sanitizedName;
@@ -1449,4 +1443,9 @@ public void setLanguageArguments(List<CodegenArgument> languageArguments) {
 
         super.setLanguageArguments(languageArguments);
     }
+
+    @Override
+    public boolean ignoreImportMapping() {
+        return true;
+    }
 }

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

@@ -1,10 +1,14 @@
 package io.swagger.codegen.v3.generators.java;
 
+import io.swagger.codegen.v3.CodegenConfig;
 import io.swagger.codegen.v3.CodegenConstants;
 import io.swagger.codegen.v3.CodegenModel;
 import io.swagger.codegen.v3.CodegenModelFactory;
 import io.swagger.codegen.v3.CodegenModelType;
 import io.swagger.codegen.v3.CodegenParameter;
+import io.swagger.codegen.v3.CodegenProperty;
+import io.swagger.util.Json;
+import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.ComposedSchema;
 import io.swagger.v3.oas.models.media.Content;
@@ -14,6 +18,9 @@
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.parameters.RequestBody;
+import io.swagger.v3.parser.OpenAPIV3Parser;
+import io.swagger.v3.parser.core.models.ParseOptions;
+import io.swagger.v3.parser.core.models.SwaggerParseResult;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -154,7 +161,7 @@ public void arraysInRequestBody() throws Exception {
         Assert.assertEquals(codegenParameter2.description, "A list of list of values");
         Assert.assertEquals(codegenParameter2.dataType, "List<List<Integer>>");
         Assert.assertEquals(codegenParameter2.baseType, "List");
-        
+
         RequestBody body3 = new RequestBody();
         body3.setDescription("A list of points");
         body3.setContent(new Content().addMediaType("application/json", new MediaType().schema(new ArraySchema().items(new ObjectSchema().$ref("#/components/schemas/Point")))));
@@ -260,4 +267,99 @@ public void customTemplates() throws Exception {
         codegen.processOpts();
         Assert.assertEquals(codegen.templateDir(), String.join(File.separator,"user", "custom", "location"));
     }
+
+    @Test
+    public void testModelNamedFile() {
+        final OpenAPI openAPI = getOpenAPI("3_0_0/model_named_file.yaml");
+        final CodegenConfig config = new JavaClientCodegen();
+        config.preprocessOpenAPI(openAPI);
+
+        final Schema modelFile = openAPI.getComponents().getSchemas().get("File");
+        final Schema modelSetting = openAPI.getComponents().getSchemas().get("Setting");
+
+        final CodegenModel codegenModelFile = config.fromModel("File", modelFile, openAPI.getComponents().getSchemas());
+        final CodegenModel codegenModelSetting = config.fromModel("Setting", modelSetting, openAPI.getComponents().getSchemas());
+
+        Assert.assertEquals(codegenModelFile.name, "File");
+        Assert.assertEquals(codegenModelSetting.name, "Setting");
+
+        final List<CodegenProperty> codegenProperties = codegenModelSetting.getVars();
+
+        Assert.assertEquals(codegenProperties.size(), 2);
+
+        CodegenProperty fileProperty = codegenProperties.stream().filter(property -> property.name.equals("file")).findAny().get();
+
+        Assert.assertEquals(fileProperty.name, "file");
+        Assert.assertEquals(fileProperty.baseType, "File");
+        Assert.assertEquals(fileProperty.datatype, "File");
+
+        CodegenProperty documentProperty = codegenProperties.stream().filter(property -> property.name.equals("document")).findAny().get();
+
+        Assert.assertEquals(documentProperty.name, "document");
+        Assert.assertEquals(documentProperty.baseType, "File");
+        Assert.assertEquals(documentProperty.datatype, "java.io.File");
+
+        Assert.assertFalse(codegenModelSetting.imports.stream().anyMatch(_import -> _import.equals("java.io.File")));
+    }
+
+    private OpenAPI getOpenAPI(String filePath) {
+        OpenAPIV3Parser openApiParser = new OpenAPIV3Parser();
+        ParseOptions options = new ParseOptions();
+        options.setResolve(true);
+        options.setFlatten(true);
+        SwaggerParseResult parseResult = openApiParser.readLocation(filePath, null, options);
+
+        return parseResult.getOpenAPI();
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

src/test/resources/3_0_0/model_named_file.yaml

@@ -0,0 +1,62 @@
+openapi: 3.0.0
+servers:
+  - description: SwaggerHub API Auto Mocking
+    url: /
+info:
+  description: This is a simple API
+  version: "1.0.0"
+  title: Simple Inventory API
+
+paths:
+  /inventory:
+    post:
+      tags:
+        - Inventory
+      summary: adds an inventory item
+      operationId: addInventory
+      description: Adds an item to the system
+      responses:
+        '201':
+          description: item created
+        '400':
+          description: 'invalid input, object invalid'
+        '409':
+          description: an existing item already exists
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Setting'
+        description: Inventory item to add
+components:
+  schemas:
+    Archive:
+      type: string
+      format: binary
+
+    File:
+      description: File.
+      type: object
+      properties:
+        prop1:
+          type: string
+
+    Date:
+      type: object
+      properties:
+        place:
+          type: string
+
+    Setting:
+      description: Setting.
+      properties:
+        file:
+          $ref: '#/components/schemas/File'
+        date:
+          $ref: '#/components/schemas/Date'
+        document:
+          type: string
+          format: binary
+        time:
+          type: string
+          format: date-time