use Postman notation for path parameter

adyen-examples · Nov 14, 2023 · b1aeedf · b1aeedf
1 parent f74b3d7
commit b1aeedf
Showing 1 changed file with 21 additions and 29 deletions.
diff --git a/src/main/java/com/tweesky/cloudtools/codegen/PostmanV2Generator.java b/src/main/java/com/tweesky/cloudtools/codegen/PostmanV2Generator.java
@@ -192,25 +192,28 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
 
     for(CodegenOperation codegenOperation : opList) {
 
+      // use Postman notation for path parameter
+      codegenOperation.path = replacesBracesInPath(codegenOperation.path);
+
       if(pathParamsAsVariables) {
-        // create Postman variable from path parameter
-        codegenOperation.path = doubleCurlyBraces(codegenOperation.path);
-      } else {
-        // use Postman notation for path parameter
-        codegenOperation.path = replacesBracesInPath(codegenOperation.path);
-        // ad-hoc customisation for specific path parameters:
-        // companyId: set value as YOUR_COMPANY_ACCOUNT env variable
-        // merchantId: set value as YOUR_MERCHANT_ACCOUNT env variable
-        if(codegenOperation.path.contains(":companyId") || codegenOperation.path.contains(":merchantId")) {
-          for(CodegenParameter codegenParameter : codegenOperation.pathParams) {
-            if(codegenParameter.paramName.equalsIgnoreCase("companyId")) {
-              // set default value for `companyId` path parameter
-              codegenParameter.defaultValue = "{{YOUR_COMPANY_ACCOUNT}}";
-            }
-            if(codegenParameter.paramName.equalsIgnoreCase("merchantId")) {
-              // set default value for `merchantId` path parameter
-              codegenParameter.defaultValue = "{{YOUR_MERCHANT_ACCOUNT}}";
-            }
+        // set value of path parameter with corresponding env variable
+        for(CodegenParameter codegenParameter : codegenOperation.pathParams) {
+          codegenParameter.defaultValue = "{{" + codegenParameter.paramName + "}}";
+        }
+      }
+
+      // ad-hoc customisation for specific path parameters:
+      // companyId: set value as YOUR_COMPANY_ACCOUNT env variable
+      // merchantId: set value as YOUR_MERCHANT_ACCOUNT env variable
+      if(codegenOperation.path.contains(":companyId") || codegenOperation.path.contains(":merchantId")) {
+        for(CodegenParameter codegenParameter : codegenOperation.pathParams) {
+          if(codegenParameter.paramName.equalsIgnoreCase("companyId")) {
+            // set default value for `companyId` path parameter
+            codegenParameter.defaultValue = "{{YOUR_COMPANY_ACCOUNT}}";
+          }
+          if(codegenParameter.paramName.equalsIgnoreCase("merchantId")) {
+            // set default value for `merchantId` path parameter
+            codegenParameter.defaultValue = "{{YOUR_MERCHANT_ACCOUNT}}";
           }
         }
       }
@@ -496,17 +499,6 @@ public String escapeQuotationMark(String input) {
     return input.replace("\"", "\\\"");
   }
 
-  String doubleCurlyBraces(String str) {
-
-    // remove doublebraces first
-    String s = str.replace("{{", "{").replace("}}", "}");
-    // change all singlebraces to doublebraces
-    s = s.replace("{", "{{").replace("}", "}}");
-
-    return s;
-
-  }
-
   // convert path from /users/{id} to /users/:id
   String replacesBracesInPath(String path) {