#396 Copy all Jackson XML annotations to accessor methods

Author: alicederyn

src/main/java/org/inferred/freebuilder/processor/Analyser.java

@@ -411,7 +411,7 @@ private Map<Property, PropertyCodeGenerator> pickPropertyGenerators(
       DeclaredType builder,
       Iterable<ExecutableElement> methods) {
     NamingConvention namingConvention = determineNamingConvention(type, methods, messager, types);
-    Optional<JacksonSupport> jacksonSupport = JacksonSupport.create(type);
+    Optional<JacksonSupport> jacksonSupport = JacksonSupport.create(type, elements);
     Set<String> methodsInvokedInBuilderConstructor =
         getMethodsInvokedInBuilderConstructor(asElement(builder));
 

src/main/java/org/inferred/freebuilder/processor/JacksonSupport.java

@@ -12,32 +12,39 @@
 
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Name;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.Elements;
 
 class JacksonSupport {
 
   private static final String JSON_DESERIALIZE =
       "com.fasterxml.jackson.databind.annotation.JsonDeserialize";
   private static final QualifiedName JSON_PROPERTY =
       QualifiedName.of("com.fasterxml.jackson.annotation", "JsonProperty");
-  private static final QualifiedName JACKSON_XML_PROPERTY =
-      QualifiedName.of("com.fasterxml.jackson.dataformat.xml.annotation", "JacksonXmlProperty");
+  private static final String JACKSON_XML_ANNOTATION_PACKAGE =
+      "com.fasterxml.jackson.dataformat.xml.annotation";
   /** Annotations which disable automatic generation of JsonProperty annotations. */
   private static final Set<QualifiedName> DISABLE_PROPERTY_ANNOTATIONS = ImmutableSet.of(
       QualifiedName.of("com.fasterxml.jackson.annotation", "JsonAnyGetter"),
       QualifiedName.of("com.fasterxml.jackson.annotation", "JsonIgnore"),
       QualifiedName.of("com.fasterxml.jackson.annotation", "JsonUnwrapped"),
       QualifiedName.of("com.fasterxml.jackson.annotation", "JsonValue"));
 
-  public static Optional<JacksonSupport> create(TypeElement userValueType) {
+  public static Optional<JacksonSupport> create(TypeElement userValueType, Elements elements) {
     return findAnnotationMirror(userValueType, JSON_DESERIALIZE)
-        .map($ -> new JacksonSupport());
+        .map($ -> new JacksonSupport(elements));
   }
 
-  private JacksonSupport() {}
+  private final Elements elements;
+
+  private JacksonSupport(Elements elements) {
+    this.elements = elements;
+  }
 
   public void addJacksonAnnotations(
-      Property.Builder resultBuilder, ExecutableElement getterMethod) {
+      Property.Builder resultBuilder,
+      ExecutableElement getterMethod) {
     Optional<AnnotationMirror> jsonPropertyAnnotation = findAnnotationMirror(getterMethod,
             JSON_PROPERTY);
     if (jsonPropertyAnnotation.isPresent()) {
@@ -47,12 +54,18 @@ public void addJacksonAnnotations(
           "@%s(\"%s\")%n", JSON_PROPERTY, resultBuilder.getName()));
     }
 
-    Optional<AnnotationMirror> jacksonXmlPropertyAnnotation = findAnnotationMirror(getterMethod,
-            JACKSON_XML_PROPERTY);
-    if (jacksonXmlPropertyAnnotation.isPresent()) {
-      resultBuilder
-              .addAccessorAnnotations(Excerpts.add("%s%n", jacksonXmlPropertyAnnotation.get()));
-    }
+    getterMethod
+        .getAnnotationMirrors()
+        .stream()
+        .filter(this::isXmlAnnotation)
+        .forEach(annotation -> {
+          resultBuilder.addAccessorAnnotations(code -> code.addLine("%s", annotation));
+        });
+  }
+
+  private boolean isXmlAnnotation(AnnotationMirror mirror) {
+    Name pkg = elements.getPackageOf(mirror.getAnnotationType().asElement()).getQualifiedName();
+    return pkg.contentEquals(JACKSON_XML_ANNOTATION_PACKAGE);
   }
 
   private static boolean generateDefaultAnnotations(ExecutableElement getterMethod) {
@@ -66,5 +79,4 @@ private static boolean generateDefaultAnnotations(ExecutableElement getterMethod
     }
     return true;
   }
-
 }

src/test/java/org/inferred/freebuilder/processor/JacksonSupportTest.java

@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText;
 
 import org.inferred.freebuilder.processor.Analyser.CannotGenerateCodeException;
 import org.inferred.freebuilder.processor.util.Excerpt;
@@ -97,6 +98,22 @@ public void jacksonXmlAnnotationAddedWithExplicitName() throws CannotGenerateCod
             JacksonXmlProperty.class, "@JacksonXmlProperty(localName = \"b-ob\")");
   }
 
+  @Test
+  public void jacksonXmlTextAnnotationAdded() throws CannotGenerateCodeException {
+    // See also https://github.com/google/FreeBuilder/issues/68
+    GeneratedBuilder builder = (GeneratedBuilder) analyser.analyse(model.newType(
+        "package com.example;",
+         "import " + JacksonXmlText.class.getName() + ";",
+        "@" + JsonDeserialize.class.getName() + "(builder = DataType.Builder.class)",
+        "public interface DataType {",
+        "  @JacksonXmlText String getFooBar();",
+        "  class Builder extends DataType_Builder {}",
+        "}"));
+
+    Property property = getOnlyElement(builder.getGeneratorsByProperty().keySet());
+    assertPropertyHasAnnotation(property, JacksonXmlText.class, "@JacksonXmlText");
+  }
+
   @Test
   public void jacksonAnnotationAddedWithImplicitName() throws CannotGenerateCodeException {
     // See also https://github.com/google/FreeBuilder/issues/90