Merge pull request #31 from palantir/feature/fix-enum-data-param-bug

Fixing enum data param bug
palantir · Mar 17, 2016 · 549160d · 549160d
2 parents ad79e2a + ed83b4f
commit 549160d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...t-service-generator-core/src/main/java/com/palantir/code/ts/generator/ServiceEmitter.java b/...t-service-generator-core/src/main/java/com/palantir/code/ts/generator/ServiceEmitter.java
@@ -131,8 +131,12 @@ public void emitTypescriptClass() {
                         throw new IllegalStateException("There should only be one data argument per endpoint. Found both" + dataArgument + " and " + parameterModel.getParameterName());
                     }
                     dataArgument = parameterModel.getParameterName();
-                    if (parameterModel.tsType().toString().equals("string")) {
-                        // strings have to be wrapped in quotes in order to be valid json
+                    boolean isEnum = false;
+                    if (parameterModel.javaType() instanceof Class<?>) {
+                        isEnum = ((Class<?>) parameterModel.javaType()).isEnum();
+                    }
+                    if (endpointModel.endpointMediaType().equals("application/json") && (parameterModel.tsType().toString().equals("string") || isEnum)) {
+                        // strings (and enums, the wire format of an enum is a string) have to be wrapped in quotes in order to be valid json
                         dataArgument = "`\"${" + parameterModel.getParameterName() + "}\"`";
                     }
                 }