From fff8b8499744149eacbb9bc0171556fb4bc9c9c4 Mon Sep 17 00:00:00 2001 From: gabor-farkas Date: Mon, 30 May 2016 15:33:51 +0200 Subject: [PATCH 1/2] Use enum name() instead of toString() --- .../jackson/module/visitors/TSJsonFormatVisitorWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java2typescript-jackson/src/main/java/java2typescript/jackson/module/visitors/TSJsonFormatVisitorWrapper.java b/java2typescript-jackson/src/main/java/java2typescript/jackson/module/visitors/TSJsonFormatVisitorWrapper.java index f2224fd..1f92add 100644 --- a/java2typescript-jackson/src/main/java/java2typescript/jackson/module/visitors/TSJsonFormatVisitorWrapper.java +++ b/java2typescript-jackson/src/main/java/java2typescript/jackson/module/visitors/TSJsonFormatVisitorWrapper.java @@ -98,7 +98,7 @@ public EnumType parseEnumOrGetFromCache(Module module, JavaType javaType) { if (namedType == null) { EnumType enumType = new EnumType(name); for (Object val : javaType.getRawClass().getEnumConstants()) { - enumType.getValues().add(val.toString()); + enumType.getValues().add(((Enum)val).name()); } module.getNamedTypes().put(name, enumType); return enumType; From f4b330042169c1500b4a40ecb6e49ddf028b1761 Mon Sep 17 00:00:00 2001 From: gabor-farkas Date: Tue, 31 May 2016 14:16:58 +0200 Subject: [PATCH 2/2] fix missing js output --- .../java/java2typescript/jaxrs/ServiceDescriptorGenerator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java2typescript-jaxrs/src/main/java/java2typescript/jaxrs/ServiceDescriptorGenerator.java b/java2typescript-jaxrs/src/main/java/java2typescript/jaxrs/ServiceDescriptorGenerator.java index 7ccc64b..e390d0a 100644 --- a/java2typescript-jaxrs/src/main/java/java2typescript/jaxrs/ServiceDescriptorGenerator.java +++ b/java2typescript-jaxrs/src/main/java/java2typescript/jaxrs/ServiceDescriptorGenerator.java @@ -186,6 +186,7 @@ public void generateJavascript(String moduleName, Writer writer) throws JsonGene // Replace template values String out = jsTemplate.replace(MODULE_NAME_PLACEHOLDER, moduleName); out = out.replace(JSON_PLACEHOLDER, jsonOut.toString()); + writer.write(out); } private RestMethod generateMethod(Method method) {