Remove unnecessary @JsonUnwrapped constructor annotation (#26)

Follow-up to #22
palantir · Jul 3, 2018 · 5243f5e · 5243f5e
1 parent 451583d
commit 5243f5e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/UnionTypeExample.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/UnionTypeExample.java
@@ -26,7 +26,7 @@ public final class UnionTypeExample {
     @JsonUnwrapped private final Union union;
 
     @JsonCreator
-    private UnionTypeExample(@JsonUnwrapped Union union) {
+    private UnionTypeExample(Union union) {
         Objects.requireNonNull(union, "union must not be null");
         this.union = union;
     }

diff --git a/conjure-java-core/src/main/java/com/palantir/conjure/java/types/UnionGenerator.java b/conjure-java-core/src/main/java/com/palantir/conjure/java/types/UnionGenerator.java
@@ -138,9 +138,7 @@ private static MethodSpec generateConstructor(TypeMapper typeMapper, ClassName u
         return MethodSpec.constructorBuilder()
                 .addModifiers(Modifier.PRIVATE)
                 .addAnnotation(AnnotationSpec.builder(JsonCreator.class).build())
-                .addParameter(ParameterSpec.builder(unionClass.nestedClass("Union"), UNION_FIELD_NAME)
-                        .addAnnotation(JsonUnwrapped.class)
-                        .build())
+                .addParameter(ParameterSpec.builder(unionClass.nestedClass("Union"), UNION_FIELD_NAME).build())
                 .addStatement(Expressions.requireNonNull(UNION_FIELD_NAME, "union must not be null"))
                 .addStatement("this.$1L = $1L", UNION_FIELD_NAME)
                 .build();