#218 do not introduce dependency on jackson-databind if not used

immutables · Dec 11, 2015 · 5e697de · 5e697de · ldriscoll · Dec 11, 2015
1 parent 5c5fc72
commit 5e697de
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/value-fixture/src/org/immutables/fixture/jackson/JacksonMappedWithNoAnnotations.java b/value-fixture/src/org/immutables/fixture/jackson/JacksonMappedWithNoAnnotations.java
@@ -3,7 +3,7 @@
 import org.immutables.value.Value;
 
 @Value.Immutable
-@Value.Style
+@MetaJacksonAnnotation
 public interface JacksonMappedWithNoAnnotations {
   String getSomeString();
 }
diff --git a/value-processor/src/org/immutables/value/processor/Immutables.generator b/value-processor/src/org/immutables/value/processor/Immutables.generator
@@ -1542,7 +1542,7 @@ private [v.type] [invokeSuperGet]() {
 [/output.trim][/template]
 
 [template generateJacksonMapped Type type]
-[if type.generateJacksonMapped or classpath.available 'com.fasterxml.jackson.annotation.JsonCreator']
+[if type.generateJacksonMapped and (classpath.available 'com.fasterxml.jackson.annotation.JsonCreator')]
 [if type.implementedAttributes]
 
 /**

diff --git a/value-processor/src/org/immutables/value/processor/meta/Proto.java b/value-processor/src/org/immutables/value/processor/meta/Proto.java
@@ -310,7 +310,7 @@ public boolean isJacksonSerialized() {
 
     @Value.Lazy
     public boolean isJacksonDeserialized() {
-      if (isJacksonDeserializedAnnotated(element())) {
+      if (isJacksonDeserializedAnnotated()) {
         // while DeclaringPackage cannot have those annotations
         // directly, just checking them as a general computation path
         // will not hurt much.
@@ -325,6 +325,11 @@ public boolean isJacksonDeserialized() {
       return false;
     }
 
+    @Value.Lazy
+    public boolean isJacksonDeserializedAnnotated() {
+      return Proto.isJacksonDeserializedAnnotated(element());
+    }
+
     @Value.Lazy
     public boolean isJacksonJsonTypeInfo() {
       if (isJacksonJsonTypeInfoAnnotated(element())) {
@@ -1198,7 +1203,7 @@ public StyleInfo apply(StyleMirror input) {
           "com.fasterxml.jackson.databind.annotation.JsonSerialize",
           "com.fasterxml.jackson.databind.annotation.JsonDeserialize");
 
-  private static boolean isJacksonSerializedAnnotated(Element element) {
+  static boolean isJacksonSerializedAnnotated(Element element) {
     List<? extends AnnotationMirror> annotationMirrors = element.getAnnotationMirrors();
     for (AnnotationMirror annotation : annotationMirrors) {
       TypeElement annotationElement = (TypeElement) annotation.getAnnotationType().asElement();
@@ -1209,7 +1214,7 @@ private static boolean isJacksonSerializedAnnotated(Element element) {
     return false;
   }
 
-  private static boolean isJacksonDeserializedAnnotated(Element element) {
+  static boolean isJacksonDeserializedAnnotated(Element element) {
     List<? extends AnnotationMirror> annotationMirrors = element.getAnnotationMirrors();
     for (AnnotationMirror annotation : annotationMirrors) {
       TypeElement annotationElement = (TypeElement) annotation.getAnnotationType().asElement();
@@ -1221,7 +1226,7 @@ private static boolean isJacksonDeserializedAnnotated(Element element) {
     return false;
   }
 
-  protected static boolean isJacksonJsonTypeInfoAnnotated(Element element) {
+  static boolean isJacksonJsonTypeInfoAnnotated(Element element) {
     List<? extends AnnotationMirror> annotationMirrors = element.getAnnotationMirrors();
     for (AnnotationMirror annotation : annotationMirrors) {
       TypeElement annotationElement = (TypeElement) annotation.getAnnotationType().asElement();

diff --git a/value-processor/src/org/immutables/value/processor/meta/ValueType.java b/value-processor/src/org/immutables/value/processor/meta/ValueType.java
@@ -242,7 +242,9 @@ public boolean isGenerateJacksonMapped() {
   }
 
   public boolean isJacksonDeserialized() {
-    return constitution.protoclass().isJacksonDeserialized();
+    Optional<DeclaringType> declaringType = constitution.protoclass().declaringType();
+    return declaringType.isPresent()
+        && declaringType.get().isJacksonDeserializedAnnotated();
   }
 
   public boolean isJacksonJsonTypeInfo() {