Fix master, json2 usage was accidentally removed

palantir · Jan 22, 2016 · c26a625 · c26a625
1 parent 78cc6c1
commit c26a625
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 0 deletions.
diff --git a/...src/main/java/com/palantir/code/ts/generator/TypescriptServiceGeneratorConfiguration.java b/...src/main/java/com/palantir/code/ts/generator/TypescriptServiceGeneratorConfiguration.java
@@ -15,17 +15,22 @@
 
 import org.immutables.value.Value;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 import cz.habarta.typescript.generator.GenericsTypeProcessor;
+import cz.habarta.typescript.generator.JsonLibrary;
 import cz.habarta.typescript.generator.Settings;
 import cz.habarta.typescript.generator.TsType;
 import cz.habarta.typescript.generator.TypeProcessor;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PUBLIC)
+@JsonDeserialize(as = ImmutableTypescriptServiceGeneratorConfiguration.class)
+@JsonSerialize(as = ImmutableTypescriptServiceGeneratorConfiguration.class)
 public abstract class TypescriptServiceGeneratorConfiguration {
 
     /**
@@ -144,6 +149,7 @@ public Settings getSettings() {
         settings.addTypeNamePrefix = generatedInterfacePrefix();
         settings.sortDeclarations = true;
         settings.noFileComment = true;
+        settings.jsonLibrary = JsonLibrary.jackson2;
 
         return settings;
     }

diff --git a/...nerator-core/src/main/java/com/palantir/code/ts/generator/model/ServiceEndpointModel.java b/...nerator-core/src/main/java/com/palantir/code/ts/generator/model/ServiceEndpointModel.java
@@ -9,10 +9,16 @@
 
 import org.immutables.value.Value;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.palantir.code.ts.generator.ImmutableTypescriptServiceGeneratorConfiguration;
+
 import cz.habarta.typescript.generator.TsType;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PUBLIC)
+@JsonDeserialize(as = ImmutableTypescriptServiceGeneratorConfiguration.class)
+@JsonSerialize(as = ImmutableTypescriptServiceGeneratorConfiguration.class)
 public abstract class ServiceEndpointModel implements Comparable<ServiceEndpointModel> {
     public abstract Type javaReturnType();
     public abstract TsType tsReturnType();

diff --git a/...ore/src/main/java/com/palantir/code/ts/generator/model/ServiceEndpointParameterModel.java b/...ore/src/main/java/com/palantir/code/ts/generator/model/ServiceEndpointParameterModel.java
@@ -11,10 +11,15 @@
 
 import org.immutables.value.Value;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
 import cz.habarta.typescript.generator.TsType;
 
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PUBLIC)
+@JsonDeserialize(as = ImmutableServiceEndpointParameterModel.class)
+@JsonSerialize(as = ImmutableServiceEndpointParameterModel.class)
 public abstract class ServiceEndpointParameterModel {
     @Nullable public abstract String pathParam();
     @Nullable public abstract String headerParam();

diff --git a/...rvice-generator-core/src/main/java/com/palantir/code/ts/generator/model/ServiceModel.java b/...rvice-generator-core/src/main/java/com/palantir/code/ts/generator/model/ServiceModel.java
@@ -10,8 +10,13 @@
 
 import org.immutables.value.Value;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
 @Value.Immutable
 @Value.Style(visibility = Value.Style.ImplementationVisibility.PUBLIC)
+@JsonDeserialize(as = ImmutableServiceModel.class)
+@JsonSerialize(as = ImmutableServiceModel.class)
 public abstract class ServiceModel {
     public abstract Set<Type> referencedTypes();
     public abstract String name();

diff --git a/...rvice-generator-core/src/test/java/com/palantir/code/ts/generator/ServiceEmitterTest.java b/...rvice-generator-core/src/test/java/com/palantir/code/ts/generator/ServiceEmitterTest.java
@@ -63,6 +63,7 @@ public void testComplexServiceClassEmitTypes() {
 "        y: MyObject;\n" +
 "    }\n" +
 "";
+        System.out.println(new String(stream.toByteArray()));
         assertEquals(expectedOutput, new String(stream.toByteArray()));
     }