renamed operation parameters class

HugoMario · HugoMario · commit 71f8078e474a · 2021-09-14T20:09:27.000-05:00
diff --git a/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java b/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java
@@ -2117,7 +2117,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
         }
 
         List<Parameter> parameters = operation.getParameters();
-        final OpenAPIParameters openAPIParameters = new OpenAPIParameters();
+        final OperationParameters operationParameters = new OperationParameters();
 
         RequestBody body = operation.getRequestBody();
         if (body != null) {
@@ -2178,20 +2178,20 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
                             }
                             // todo: this segment is only to support the "older" template design. it should be removed once all templates are updated with the new {{#contents}} tag.
                             formParameter.getVendorExtensions().put(CodegenConstants.IS_FORM_PARAM_EXT_NAME, Boolean.TRUE);
-                            openAPIParameters.addFormParam(formParameter.copy());
+                            operationParameters.addFormParam(formParameter.copy());
                             if (body.getRequired() != null && body.getRequired()) {
-                                openAPIParameters.addRequiredParam(formParameter.copy());
+                                operationParameters.addRequiredParam(formParameter.copy());
                             }
-                            openAPIParameters.addAllParams(formParameter);
+                            operationParameters.addAllParams(formParameter);
                         }
-                        openAPIParameters.addCodegenContents(codegenContent);
+                        operationParameters.addCodegenContents(codegenContent);
                     }
                 } else {
                     CodegenParameter bodyParam = fromRequestBody(body, schemaName, schema, schemas, imports);
-                    openAPIParameters.setBodyParam(bodyParam);
+                    operationParameters.setBodyParam(bodyParam);
                     if (foundSchemas.isEmpty()) {
-                        openAPIParameters.addBodyParams(bodyParam.copy());
-                        openAPIParameters.addAllParams(bodyParam);
+                        operationParameters.addBodyParams(bodyParam.copy());
+                        operationParameters.addAllParams(bodyParam);
                     } else {
                         boolean alreadyAdded = false;
                         for (Schema usedSchema : foundSchemas) {
@@ -2204,7 +2204,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
                         }
                     }
                     foundSchemas.add(schema);
-                    openAPIParameters.addCodegenContents(codegenContent);
+                    operationParameters.addCodegenContents(codegenContent);
                 }
             }
         }
@@ -2215,24 +2215,24 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
                     param = getParameterFromRef(param.get$ref(), openAPI);
                 }
                 CodegenParameter codegenParameter = fromParameter(param, imports);
-                openAPIParameters.addParameters(param, codegenParameter);
+                operationParameters.addParameters(param, codegenParameter);
             }
         }
 
         addOperationImports(codegenOperation, imports);
 
-        codegenOperation.bodyParam = openAPIParameters.getBodyParam();
+        codegenOperation.bodyParam = operationParameters.getBodyParam();
         codegenOperation.httpMethod = httpMethod.toUpperCase();
 
         // move "required" parameters in front of "optional" parameters
         if (sortParamsByRequiredFlag) {
-            openAPIParameters.sortRequiredAllParams();
+            operationParameters.sortRequiredAllParams();
         }
 
-        openAPIParameters.addHasMore(codegenOperation);
+        operationParameters.addHasMore(codegenOperation);
         codegenOperation.externalDocs = operation.getExternalDocs();
 
-        configuresParameterForMediaType(codegenOperation, openAPIParameters.getCodegenContents());
+        configuresParameterForMediaType(codegenOperation, operationParameters.getCodegenContents());
         // legacy support
         codegenOperation.nickname = codegenOperation.operationId;
 
@@ -4331,7 +4331,7 @@ protected void configuresParameterForMediaType(CodegenOperation codegenOperation
                     }
                 }
             );
-            OpenAPIParameters.addHasMore(content.getParameters());
+            OperationParameters.addHasMore(content.getParameters());
         }
         codegenOperation.getContents().addAll(codegenContents);
     }
diff --git a/src/main/java/io/swagger/codegen/v3/generators/OperationParameters.java b/src/main/java/io/swagger/codegen/v3/generators/OperationParameters.java
@@ -14,7 +14,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class OpenAPIParameters {
+public class OperationParameters {
 
     private CodegenParameter bodyParam = null;
     private List<CodegenParameter> allParams = new ArrayList<>();
diff --git a/src/main/java/io/swagger/codegen/v3/generators/nodejs/NodeJSServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/nodejs/NodeJSServerCodegen.java
@@ -10,7 +10,7 @@
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
-import io.swagger.codegen.v3.generators.OpenAPIParameters;
+import io.swagger.codegen.v3.generators.OperationParameters;
 import io.swagger.codegen.v3.utils.URLPathUtil;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
@@ -453,7 +453,7 @@ protected void configuresParameterForMediaType(CodegenOperation codegenOperation
             addParameters(content, codegenOperation.cookieParams);
         }
         for (CodegenContent content : codegenContents) {
-            OpenAPIParameters.addHasMore(content.getParameters());
+            OperationParameters.addHasMore(content.getParameters());
         }
         codegenOperation.getContents().addAll(codegenContents);
     }

Original file line number	Diff line number	Diff line change
`@@ -2117,7 +2117,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation`
`2117`	`2117`	`}`
`2118`	`2118`
`2119`	`2119`	`List<Parameter> parameters = operation.getParameters();`
`2120`		`- final OpenAPIParameters openAPIParameters = new OpenAPIParameters();`
	`2120`	`+ final OperationParameters operationParameters = new OperationParameters();`
`2121`	`2121`
`2122`	`2122`	`RequestBody body = operation.getRequestBody();`
`2123`	`2123`	`if (body != null) {`
`@@ -2178,20 +2178,20 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation`
`2178`	`2178`	`}`
`2179`	`2179`	`// todo: this segment is only to support the "older" template design. it should be removed once all templates are updated with the new {{#contents}} tag.`
`2180`	`2180`	`formParameter.getVendorExtensions().put(CodegenConstants.IS_FORM_PARAM_EXT_NAME, Boolean.TRUE);`
`2181`		`- openAPIParameters.addFormParam(formParameter.copy());`
	`2181`	`+ operationParameters.addFormParam(formParameter.copy());`
`2182`	`2182`	`if (body.getRequired() != null && body.getRequired()) {`
`2183`		`- openAPIParameters.addRequiredParam(formParameter.copy());`
	`2183`	`+ operationParameters.addRequiredParam(formParameter.copy());`
`2184`	`2184`	`}`
`2185`		`- openAPIParameters.addAllParams(formParameter);`
	`2185`	`+ operationParameters.addAllParams(formParameter);`
`2186`	`2186`	`}`
`2187`		`- openAPIParameters.addCodegenContents(codegenContent);`
	`2187`	`+ operationParameters.addCodegenContents(codegenContent);`
`2188`	`2188`	`}`
`2189`	`2189`	`} else {`
`2190`	`2190`	`CodegenParameter bodyParam = fromRequestBody(body, schemaName, schema, schemas, imports);`
`2191`		`- openAPIParameters.setBodyParam(bodyParam);`
	`2191`	`+ operationParameters.setBodyParam(bodyParam);`
`2192`	`2192`	`if (foundSchemas.isEmpty()) {`
`2193`		`- openAPIParameters.addBodyParams(bodyParam.copy());`
`2194`		`- openAPIParameters.addAllParams(bodyParam);`
	`2193`	`+ operationParameters.addBodyParams(bodyParam.copy());`
	`2194`	`+ operationParameters.addAllParams(bodyParam);`
`2195`	`2195`	`} else {`
`2196`	`2196`	`boolean alreadyAdded = false;`
`2197`	`2197`	`for (Schema usedSchema : foundSchemas) {`
`@@ -2204,7 +2204,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation`
`2204`	`2204`	`}`
`2205`	`2205`	`}`
`2206`	`2206`	`foundSchemas.add(schema);`
`2207`		`- openAPIParameters.addCodegenContents(codegenContent);`
	`2207`	`+ operationParameters.addCodegenContents(codegenContent);`
`2208`	`2208`	`}`
`2209`	`2209`	`}`
`2210`	`2210`	`}`
`@@ -2215,24 +2215,24 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation`
`2215`	`2215`	`param = getParameterFromRef(param.get$ref(), openAPI);`
`2216`	`2216`	`}`
`2217`	`2217`	`CodegenParameter codegenParameter = fromParameter(param, imports);`
`2218`		`- openAPIParameters.addParameters(param, codegenParameter);`
	`2218`	`+ operationParameters.addParameters(param, codegenParameter);`
`2219`	`2219`	`}`
`2220`	`2220`	`}`
`2221`	`2221`
`2222`	`2222`	`addOperationImports(codegenOperation, imports);`
`2223`	`2223`
`2224`		`- codegenOperation.bodyParam = openAPIParameters.getBodyParam();`
	`2224`	`+ codegenOperation.bodyParam = operationParameters.getBodyParam();`
`2225`	`2225`	`codegenOperation.httpMethod = httpMethod.toUpperCase();`
`2226`	`2226`
`2227`	`2227`	`// move "required" parameters in front of "optional" parameters`
`2228`	`2228`	`if (sortParamsByRequiredFlag) {`
`2229`		`- openAPIParameters.sortRequiredAllParams();`
	`2229`	`+ operationParameters.sortRequiredAllParams();`
`2230`	`2230`	`}`
`2231`	`2231`
`2232`		`- openAPIParameters.addHasMore(codegenOperation);`
	`2232`	`+ operationParameters.addHasMore(codegenOperation);`
`2233`	`2233`	`codegenOperation.externalDocs = operation.getExternalDocs();`
`2234`	`2234`
`2235`		`- configuresParameterForMediaType(codegenOperation, openAPIParameters.getCodegenContents());`
	`2235`	`+ configuresParameterForMediaType(codegenOperation, operationParameters.getCodegenContents());`
`2236`	`2236`	`// legacy support`
`2237`	`2237`	`codegenOperation.nickname = codegenOperation.operationId;`
`2238`	`2238`
`@@ -4331,7 +4331,7 @@ protected void configuresParameterForMediaType(CodegenOperation codegenOperation`
`4331`	`4331`	`}`
`4332`	`4332`	`}`
`4333`	`4333`	`);`
`4334`		`- OpenAPIParameters.addHasMore(content.getParameters());`
	`4334`	`+ OperationParameters.addHasMore(content.getParameters());`
`4335`	`4335`	`}`
`4336`	`4336`	`codegenOperation.getContents().addAll(codegenContents);`
`4337`	`4337`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`import com.google.common.collect.ArrayListMultimap;`
`11`	`11`	`import com.google.common.collect.Lists;`
`12`	`12`	`import com.google.common.collect.Multimap;`
`13`		`-import io.swagger.codegen.v3.generators.OpenAPIParameters;`
	`13`	`+import io.swagger.codegen.v3.generators.OperationParameters;`
`14`	`14`	`import io.swagger.codegen.v3.utils.URLPathUtil;`
`15`	`15`	`import io.swagger.v3.oas.models.OpenAPI;`
`16`	`16`	`import io.swagger.v3.oas.models.Operation;`
`@@ -453,7 +453,7 @@ protected void configuresParameterForMediaType(CodegenOperation codegenOperation`
`453`	`453`	`addParameters(content, codegenOperation.cookieParams);`
`454`	`454`	`}`
`455`	`455`	`for (CodegenContent content : codegenContents) {`
`456`		`- OpenAPIParameters.addHasMore(content.getParameters());`
	`456`	`+ OperationParameters.addHasMore(content.getParameters());`
`457`	`457`	`}`
`458`	`458`	`codegenOperation.getContents().addAll(codegenContents);`
`459`	`459`	`}`