fix: update reserved words (#272)

twilio · Oct 28, 2022 · 577eb5e · 577eb5e
1 parent bfeb593
commit 577eb5e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/src/main/java/com/twilio/oai/TwilioCodegenAdapter.java b/src/main/java/com/twilio/oai/TwilioCodegenAdapter.java
@@ -1,6 +1,7 @@
 package com.twilio.oai;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.stream.Stream;
 
@@ -38,6 +39,11 @@ public void processOpts() {
         codegen.additionalProperties().put("apiVersionClass", StringUtils.camelize(version));
 
         codegen.supportingFiles().clear();
+
+        Arrays.asList("Configuration", "Parameter", "Version").forEach(word -> {
+            codegen.reservedWords().remove(word);
+            codegen.reservedWords().remove(word.toLowerCase());
+        });
     }
 
     public void setDomain(final String domain) {

diff --git a/src/main/java/com/twilio/oai/common/ApplicationConstants.java b/src/main/java/com/twilio/oai/common/ApplicationConstants.java
@@ -18,8 +18,4 @@ public class ApplicationConstants {
     public static final String LIST_END = ">";
 
     public static final String OBJECT = "Object";
-
-    public static final String _CONFIGURATION = "_Configuration";
-
-    public static final String _VERSION = "_Version";
 }
diff --git a/src/main/java/com/twilio/oai/resolver/csharp/CodegenParameterResolver.java b/src/main/java/com/twilio/oai/resolver/csharp/CodegenParameterResolver.java
@@ -1,18 +1,19 @@
 package com.twilio.oai.resolver.csharp;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.twilio.oai.StringHelper;
 import com.twilio.oai.common.ApplicationConstants;
 import com.twilio.oai.common.EnumConstants;
 import com.twilio.oai.resolver.Resolver;
-import org.openapitools.codegen.CodegenParameter;
-import org.openapitools.codegen.IJsonSchemaValidationProperties;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.openapitools.codegen.CodegenParameter;
+import org.openapitools.codegen.IJsonSchemaValidationProperties;
+
 public class CodegenParameterResolver implements Resolver<CodegenParameter> {
     private final Map<String, Map<String, Object>> conventionMap;
     private String className;
@@ -62,17 +63,8 @@ private boolean isContainerType(CodegenParameter parameter){
         return false;
     }
 
-    public List<CodegenParameter> resolveParameters(List<CodegenParameter> parameters) {
-        for (CodegenParameter parameter: parameters) {
-            // Adding reserved keyword for backward compatibility
-            if (ApplicationConstants._CONFIGURATION.equals(parameter.paramName)) {
-                parameter.paramName = "Configuration";
-            } else if (ApplicationConstants._VERSION.equals(parameter.paramName)) {
-                parameter.paramName = "Version";
-            }
-            resolve(parameter);
-        }
-        return parameters;
+    public void resolveParameters(List<CodegenParameter> parameters) {
+        parameters.forEach(this::resolve);
     }
 
     public static Map<String, Map<String, Object>> getConventionalMap() {
@@ -115,5 +107,4 @@ public void setHasEnumsInOptions(boolean hasEnumsInOptions) {
     public void setEnumsDict(HashSet<String> enumsDict) {
         this.enumsDict = enumsDict;
     }
-
 }