Merge pull request #9 from OpenAPITools/cleanup-generators

Cleanup generators and templates

Author: spacether

modules/openapi-json-schema-generator-gradle-plugin/src/test/kotlin/GeneratorsTaskDslTest.kt

@@ -29,10 +29,10 @@ class GeneratorsTaskDslTest : TestBase() {
         // Assert
         assertTrue(result.output.contains("The following generators are available:"), "User-friendly generator notice is missing.")
         assertTrue(result.output.contains("CLIENT generators:"), "Expected client generator header is missing.")
-        assertTrue(result.output.contains("android"), "Spot-checking listed client generators is missing a client generator.")
+        assertTrue(result.output.contains("kotlin"), "Spot-checking listed client generators is missing a client generator.")
         assertTrue(result.output.contains("SERVER generators:"), "Expected server generator header is missing.")
-        assertTrue(result.output.contains("kotlin-server"), "Spot-checking listed server generators is missing a server generator.")
+        assertTrue(result.output.contains("jaxrs-jersey"), "Spot-checking listed server generators is missing a server generator.")
         assertEquals(TaskOutcome.SUCCESS, result.task(":openApiGenerators")?.outcome,
                 "Expected a successful run, but found ${result.task(":openApiGenerators")?.outcome}")
     }
-}
+}

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -34,7 +34,6 @@
 import org.openapitools.codegen.api.TemplatingEngineAdapter;
 import org.openapitools.codegen.config.GlobalSettings;
 import org.openapitools.codegen.examples.ExampleGenerator;
-import org.openapitools.codegen.languages.RustServerCodegen;
 import org.openapitools.codegen.meta.FeatureSet;
 import org.openapitools.codegen.meta.GeneratorMetadata;
 import org.openapitools.codegen.meta.Stability;
@@ -4852,11 +4851,7 @@ public CodegenParameter fromParameter(Parameter parameter, Set<String> imports)
             parameterSchema = unaliasSchema(parameter.getSchema());
             parameterModelName = getParameterDataType(parameter, parameterSchema);
             CodegenProperty prop;
-            if (this instanceof RustServerCodegen) {
-                // for rust server, we need to do somethings special as it uses
-                // $ref (e.g. #components/schemas/Pet) to determine whether it's a model
-                prop = fromProperty(parameter.getName(), parameterSchema, false);
-            } else if (getUseInlineModelResolver()) {
+            if (getUseInlineModelResolver()) {
                 prop = fromProperty(parameter.getName(), getReferencedSchemaWhenNotEnum(parameterSchema), false);
             } else {
                 prop = fromProperty(parameter.getName(), parameterSchema, false);
@@ -4906,9 +4901,7 @@ public CodegenParameter fromParameter(Parameter parameter, Set<String> imports)
             return codegenParameter;
         }
 
-        if (getUseInlineModelResolver() && !(this instanceof RustServerCodegen)) {
-            // for rust server, we cannot run the following as it uses
-            // $ref (e.g. #components/schemas/Pet) to determine whether it's a model
+        if (getUseInlineModelResolver()) {
             parameterSchema = getReferencedSchemaWhenNotEnum(parameterSchema);
         }
 

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

@@ -40,7 +40,6 @@
 import org.openapitools.codegen.api.TemplatingEngineAdapter;
 import org.openapitools.codegen.api.TemplateFileType;
 import org.openapitools.codegen.ignore.CodegenIgnoreProcessor;
-import org.openapitools.codegen.languages.PythonPriorClientCodegen;
 import org.openapitools.codegen.languages.PythonClientCodegen;
 import org.openapitools.codegen.meta.GeneratorMetadata;
 import org.openapitools.codegen.meta.Stability;
@@ -541,7 +540,7 @@ void generateModels(List<File> files, List<ModelMap> allModels, List<String> unu
                     ModelMap modelTemplate = modelList.get(0);
                     if (modelTemplate != null && modelTemplate.getModel() != null) {
                         CodegenModel m = modelTemplate.getModel();
-                        if (m.isAlias && !((config instanceof PythonPriorClientCodegen) || (config instanceof PythonClientCodegen))) {
+                        if (m.isAlias && !(config instanceof PythonClientCodegen)) {
                             // alias to number, string, enum, etc, which should not be generated as model
                             // for PythonClientCodegen, all aliases are generated as models
                             continue;  // Don't create user-defined classes for aliases