Merge pull request #10190 from swagger-api/issue-10187

avoid creation of classes from primitive types models

Author: HugoMario

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java

@@ -280,7 +280,7 @@ public void run() {
         }
 
         if (skipAliasGeneration != null) {
-            configurator.setSkipAliasGeneration(removeOperationIdPrefix);
+            configurator.setSkipAliasGeneration(skipAliasGeneration);
         }
 
         if (ignoreImportMappings != null) {

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -3995,4 +3995,14 @@ public void setIgnoreImportMapping(boolean ignoreImportMapping) {
     public boolean defaultIgnoreImportMappingOption() {
         return false;
     }
+
+    protected boolean isModelObject(ModelImpl model) {
+        if ("object".equalsIgnoreCase(model.getType())) {
+            return true;
+        }
+        if ((StringUtils.EMPTY.equalsIgnoreCase(model.getType()) || model.getType() == null) && (model.getProperties() != null && !model.getProperties().isEmpty())) {
+            return true;
+        }
+        return false;
+    }
 }

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java

@@ -4,8 +4,13 @@
 import com.samskivert.mustache.Mustache;
 import io.swagger.codegen.*;
 import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.Swagger;
 import io.swagger.models.properties.ArrayProperty;
 import io.swagger.models.properties.Property;
+import io.swagger.models.properties.PropertyBuilder;
+import io.swagger.models.properties.RefProperty;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,6 +34,8 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
     // Defines the sdk option for targeted frameworks, which differs from targetFramework and targetFrameworkNuget
     private static final String MCS_NET_VERSION_KEY = "x-mcs-sdk";
 
+    protected Swagger swagger;
+
     protected String packageGuid = "{" + java.util.UUID.randomUUID().toString().toUpperCase() + "}";
     protected String clientPackage = "IO.Swagger.Client";
     protected String localVariablePrefix = "";
@@ -433,6 +440,10 @@ public void processOpts() {
 
         additionalProperties.put("apiDocPath", apiDocPath);
         additionalProperties.put("modelDocPath", modelDocPath);
+
+        if (skipAliasGeneration == null) {
+            skipAliasGeneration = true;
+        }
     }
 
     public void setModelPropertyNaming(String naming) {
@@ -477,6 +488,26 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         return objs;
     }
 
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        if (p instanceof RefProperty && this.swagger != null) {
+            final Map<String, Model> allDefinitions = this.swagger.getDefinitions();
+            final Model referencedModel = allDefinitions.get(swaggerType);
+            if (referencedModel == null) {
+                return swaggerType;
+            }
+            if (referencedModel instanceof ModelImpl) {
+                final ModelImpl model = (ModelImpl) referencedModel;
+                if (!this.isModelObject(model) && (model.getEnum() == null || model.getEnum().isEmpty())) {
+                    final Property property = PropertyBuilder.build(model.getType(), model.getFormat(), null);
+                    swaggerType = getSwaggerType(property);
+                }
+            }
+        }
+        return swaggerType;
+    }
+
     @Override
     public CodegenType getTag() {
         return CodegenType.CLIENT;
@@ -803,4 +834,9 @@ public Mustache.Compiler processCompiler(Mustache.Compiler compiler) {
         // To avoid unexpected behaviors when options are passed programmatically such as { "supportsAsync": "" }
         return super.processCompiler(compiler).emptyStringIsFalse(true);
     }
+
+    @Override
+    public void preprocessSwagger(Swagger swagger) {
+        this.swagger = swagger;
+    }
 }