replace fromOperation with postProcessOperations

OpenAPITools · Apr 8, 2018 · adbde2f · adbde2f
1 parent 9d1ae0d
commit adbde2f
Showing 1 changed file with 33 additions and 26 deletions.
diff --git a/...openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java b/...openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java
@@ -14,6 +14,7 @@
 import java.io.File;
 import java.util.Arrays;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 import io.swagger.v3.oas.models.OpenAPI;
@@ -260,35 +261,41 @@ public void processOpts() {
         // not including base object test as the moment as not all API has model
         //writeOptional(outputFolder, new SupportingFile("base_object_spec.mustache", specFolder, "base_object_spec.rb"));
     }
-
-    @Override
-    public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map<String, Schema> schemas, OpenAPI openAPI) {
-        CodegenOperation op = super.fromOperation(path, httpMethod, operation, schemas, openAPI);
-        // Set vendor-extension to be used in template:
-        //     x-codegen-hasMoreRequired
-        //     x-codegen-hasMoreOptional
-        //     x-codegen-hasRequiredParams
-        CodegenParameter lastRequired = null;
-        CodegenParameter lastOptional = null;
-        for (CodegenParameter p : op.allParams) {
-            if (p.required) {
-                lastRequired = p;
-            } else {
-                lastOptional = p;
+
+    @Override
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
+        List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
+        for (CodegenOperation op : operationList) {
+            // Set vendor-extension to be used in template:
+            //     x-codegen-hasMoreRequired
+            //     x-codegen-hasMoreOptional
+            //     x-codegen-hasRequiredParams
+            CodegenParameter lastRequired = null;
+            CodegenParameter lastOptional = null;
+            for (CodegenParameter p : op.allParams) {
+                if (p.required) {
+                    lastRequired = p;
+                } else {
+                    lastOptional = p;
+                }
             }
-        }
-        for (CodegenParameter p : op.allParams) {
-            if (p == lastRequired) {
-                p.vendorExtensions.put("x-codegen-hasMoreRequired", false);
-            } else if (p == lastOptional) {
-                p.vendorExtensions.put("x-codegen-hasMoreOptional", false);
-            } else {
-                p.vendorExtensions.put("x-codegen-hasMoreRequired", true);
-                p.vendorExtensions.put("x-codegen-hasMoreOptional", true);
+
+            for (CodegenParameter p : op.allParams) {
+                if (p == lastRequired) {
+                    p.vendorExtensions.put("x-codegen-hasMoreRequired", false);
+                } else if (p == lastOptional) {
+                    p.vendorExtensions.put("x-codegen-hasMoreOptional", false);
+                } else {
+                    p.vendorExtensions.put("x-codegen-hasMoreRequired", true);
+                    p.vendorExtensions.put("x-codegen-hasMoreOptional", true);
+                }
             }
+            op.vendorExtensions.put("x-codegen-hasRequiredParams", lastRequired != null);
+
         }
-        op.vendorExtensions.put("x-codegen-hasRequiredParams", lastRequired != null);
-        return op;
+
+        return objs;
     }
 
     @Override