flattenInlineComposedSchema in request options

Author: frantuma

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/config/CodegenConfigurator.java

@@ -480,7 +480,6 @@ public ClientOptInput toClientOptInput() {
             options.setFlattenComposedSchemas(flattenInlineSchema);
             SwaggerParseResult result = new OpenAPIParser().readContents(inputSpec, authorizationValues, options);
             OpenAPI openAPI = result.getOpenAPI();
-
             if (config.needsUnflattenedSpec()) {
                 ParseOptions optionsUnflattened = new ParseOptions();
                 optionsUnflattened.setResolve(true);

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/service/GenerationRequest.java

@@ -11,11 +11,6 @@ public class GenerationRequest implements Serializable {
     private Options options = new Options();
     private Type type;
     private CodegenVersion codegenVersion = CodegenVersion.V3;
-    private boolean flattenInlineComposedSchemas = false;
-
-    public boolean isFlattenInlineComposedSchemas() {
-        return flattenInlineComposedSchemas;
-    }
 
     public enum Type {
         CLIENT("client"), SERVER("server"), DOCUMENTATION("documentation"), CONFIG("config");
@@ -44,11 +39,6 @@ public enum CodegenVersion {
         V2, V3;
     }
 
-    public GenerationRequest flattenInlineComposedSchema(boolean flattenInlineComposedSchemas) {
-        this.flattenInlineComposedSchemas = flattenInlineComposedSchemas;
-        return this;
-    }
-
     public GenerationRequest lang(String lang) {
         this.lang = lang;
         return this;

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/service/GeneratorUtil.java

@@ -196,7 +196,8 @@ public static ClientOptInput getClientOptInput(GenerationRequest generationReque
         configurator.setOutputDir(generationRequest.getOptions().getOutputDir());
         configurator.setInputSpec(inputSpec);
         configurator.setInputSpecURL(inputSpecURL);
-        configurator.setFlattenInlineSchema(generationRequest.isFlattenInlineComposedSchemas());
+
+        configurator.setFlattenInlineSchema(generationRequest.getOptions().isFlattenInlineComposedSchemas());
 
         if (isNotEmpty(lang)) {
             configurator.setLang(lang);

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/service/Options.java

@@ -40,6 +40,8 @@ public class Options {
 
     private Map<String, String> codegenArguments = new LinkedHashMap<>();
 
+    private boolean flattenInlineComposedSchemas = false;
+
     public Options authorizationValue(AuthorizationValue authorizationValue) {
         this.authorizationValue = authorizationValue;
         return this;
@@ -429,7 +431,7 @@ public Boolean getSkipOverride() {
     public void setSkipOverride(Boolean skipOverride) {
         this.skipOverride = skipOverride;
     }
-    
+
     public Options resolveFully(Boolean resolveFully) {
         this.resolveFully = resolveFully;
         return this;
@@ -442,4 +444,15 @@ public Boolean getResolveFully() {
     public void setResolveFully(Boolean resolveFully) {
         this.resolveFully = resolveFully;
     }
+
+    public boolean isFlattenInlineComposedSchemas() {
+        return flattenInlineComposedSchemas;
+    }
+    public void setFlattenInlineComposedSchema(boolean flattenInlineComposedSchemas) {
+        this.flattenInlineComposedSchemas = flattenInlineComposedSchemas;
+    }
+    public Options flattenInlineComposedSchema(boolean flattenInlineComposedSchemas) {
+        this.flattenInlineComposedSchemas = flattenInlineComposedSchemas;
+        return this;
+    }
 }

modules/swagger-codegen/src/test/java/io/swagger/codegen/v3/service/GeneratorServiceTest.java

@@ -29,9 +29,9 @@ public void testGenerator_FlattenInlineComposedSchema() throws IOException {
                 .type(GenerationRequest.Type.CLIENT)
                 .lang("java")
                 .spec(loadSpecAsNode("3_0_0/FlattenComposedInlineSchema.yaml", true, false))
-                .flattenInlineComposedSchema(true)
                 .options(
                         new Options()
+                                .flattenInlineComposedSchema(true)
                                 .outputDir(path)
                 );