Merge pull request #416 from inferred/new.annotations.not.inherited

Stop accidentally inheriting IgnoredByEquals/NotInToString

Author: alicederyn

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

@@ -453,8 +453,10 @@ private void addPropertyData(
     if (jacksonSupport.isPresent()) {
       jacksonSupport.get().addJacksonAnnotations(propertyBuilder, method);
     }
-    propertyBuilder.setInEqualsAndHashCode(method.getAnnotation(IgnoredByEquals.class) == null);
-    propertyBuilder.setInToString(method.getAnnotation(NotInToString.class) == null);
+    if (method.getEnclosingElement().equals(valueType)) {
+        propertyBuilder.setInEqualsAndHashCode(method.getAnnotation(IgnoredByEquals.class) == null);
+        propertyBuilder.setInToString(method.getAnnotation(NotInToString.class) == null);
+    }
     if (propertyType.getKind().isPrimitive()) {
       PrimitiveType unboxedType = types.getPrimitiveType(propertyType.getKind());
       TypeMirror boxedType = types.erasure(types.boxedClass(unboxedType).asType());

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

@@ -463,7 +463,7 @@ public void twoGetters_interface() throws CannotGenerateCodeException {
   }
 
   @Test
-  public void ignoredEqualsAndHashCode() throws CannotGenerateCodeException {
+  public void ignoredByEquals() throws CannotGenerateCodeException {
     GeneratedBuilder builder = (GeneratedBuilder) analyser.analyse(model.newType(
         "package com.example;",
         "public class DataType {",
@@ -485,7 +485,33 @@ public void ignoredEqualsAndHashCode() throws CannotGenerateCodeException {
   }
 
   @Test
-  public void ignoredToString() throws CannotGenerateCodeException {
+  public void ignoredByEquals_notInherited() throws CannotGenerateCodeException {
+    model.newType(
+        "package com.example;",
+        "public interface HasName {",
+        "  @" + IgnoredByEquals.class.getName() + " public abstract String getName();",
+        "}");
+    GeneratedBuilder builder = (GeneratedBuilder) analyser.analyse(model.newType(
+        "package com.example;",
+        "public class DataType implements HasName {",
+        "  public static class Builder extends DataType_Builder {}",
+        "}"));
+
+    Property name = new Property.Builder()
+        .setAllCapsName("NAME")
+        .setCapitalizedName("Name")
+        .setFullyCheckedCast(true)
+        .setGetterName("getName")
+        .setName("name")
+        .setType(model.typeMirror(String.class))
+        .setUsingBeanConvention(true)
+        .setInEqualsAndHashCode(true)
+        .build();
+    assertThat(builder.getGeneratorsByProperty().keySet()).containsExactly(name);
+  }
+
+  @Test
+  public void notInToString() throws CannotGenerateCodeException {
     GeneratedBuilder builder = (GeneratedBuilder) analyser.analyse(model.newType(
         "package com.example;",
         "public class DataType {",
@@ -506,6 +532,32 @@ public void ignoredToString() throws CannotGenerateCodeException {
     assertThat(builder.getGeneratorsByProperty().keySet()).containsExactly(name);
   }
 
+  @Test
+  public void notInToString_notInherited() throws CannotGenerateCodeException {
+    model.newType(
+        "package com.example;",
+        "public interface HasName {",
+        "  @" + NotInToString.class.getName() + " public abstract String getName();",
+        "}");
+    GeneratedBuilder builder = (GeneratedBuilder) analyser.analyse(model.newType(
+        "package com.example;",
+        "public class DataType implements HasName {",
+        "  public static class Builder extends DataType_Builder {}",
+        "}"));
+
+    Property name = new Property.Builder()
+        .setAllCapsName("NAME")
+        .setCapitalizedName("Name")
+        .setFullyCheckedCast(true)
+        .setGetterName("getName")
+        .setName("name")
+        .setType(model.typeMirror(String.class))
+        .setUsingBeanConvention(true)
+        .setInToString(true)
+        .build();
+    assertThat(builder.getGeneratorsByProperty().keySet()).containsExactly(name);
+  }
+
   @Test
   public void ignoredEqualsAndHashCodeAndToString() throws CannotGenerateCodeException {
     GeneratedBuilder builder = (GeneratedBuilder) analyser.analyse(model.newType(