corrected model json name and hasNestedRequestBody (#533)

twilio · Oct 30, 2023 · 9821a21 · 9821a21
1 parent 6e85d06
commit 9821a21
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/com/twilio/oai/api/ApiResourceBuilder.java b/src/main/java/com/twilio/oai/api/ApiResourceBuilder.java
@@ -3,6 +3,7 @@
 import com.twilio.oai.DirectoryStructureService;
 import com.twilio.oai.PathUtils;
 import com.twilio.oai.StringHelper;
+import com.twilio.oai.common.ApplicationConstants;
 import com.twilio.oai.common.Utility;
 import com.twilio.oai.resolver.Resolver;
 import com.twilio.oai.resource.Resource;
@@ -20,7 +21,7 @@
 public abstract class ApiResourceBuilder implements IApiResourceBuilder {
     public static final String META_LIST_PARAMETER_KEY = "x-list-parameters";
     public static final String META_CONTEXT_PARAMETER_KEY = "x-context-parameters";
-    public static final String NESTED_CONTENT_TYPE = "application/json";
+    public static final String CONTENT_TYPE_JSON = "application/json";
 
     protected final IApiActionTemplate template;
     @Getter
@@ -338,7 +339,7 @@ protected void categorizeOperations() {
     protected boolean updateNestedContent(CodegenOperation co) {
         if(!hasNestedRequestBody) {
             if (co.bodyParam != null && co.bodyParam.getContent() != null) {
-                hasNestedRequestBody = co.bodyParam.getContent().containsKey(NESTED_CONTENT_TYPE);
+                hasNestedRequestBody = co.bodyParam.getContent().containsKey(CONTENT_TYPE_JSON);
             }
         }
         return hasNestedRequestBody;

diff --git a/src/main/java/com/twilio/oai/api/JavaApiResourceBuilder.java b/src/main/java/com/twilio/oai/api/JavaApiResourceBuilder.java
@@ -350,7 +350,7 @@ private void processDataTypesForParams(List<CodegenParameter> finalQueryParamLis
     @Override
     protected Map<String, Object> mapOperation(CodegenOperation co) {
         Map<String, Object> operationMap = super.mapOperation(co);
-        if (hasNestedRequestBody) {
+        if (co.bodyParam !=null && co.bodyParam.getContent() != null && co.bodyParam.getContent().containsKey(CONTENT_TYPE_JSON)) {
             operationMap.put(SIGNATURE_LIST, generateSignatureListJson(co));
             modelParameters = generateSignatureListBody(co);
         } else {

diff --git a/src/main/resources/twilio-java/models.mustache b/src/main/resources/twilio-java/models.mustache
@@ -4,7 +4,7 @@
         static public class {{classname}} {
         {{#vars}}
             @JsonInclude(JsonInclude.Include.NON_EMPTY)
-            @JsonProperty("{{#lambda.lowercase}}{{{nameInSnakeCase}}}{{/lambda.lowercase}}")
+            @JsonProperty("{{{baseName}}}")
             @Getter @Setter private {{{dataType}}} {{name}};
             {{#vendorExtensions.x-serialize}}
             public String get{{#lambda.titlecase}}{{name}}{{/lambda.titlecase}}() {