Fix support for wildcards in private epoxyattributes (#451)

* Fix support for wildcards in private epoxyattributes * fix imports * remove old tests
airbnb · Jun 18, 2018 · bcfecc8 · bcfecc8
1 parent c338f41
commit bcfecc8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 52 deletions.
diff --git a/epoxy-processor/src/main/java/com/airbnb/epoxy/BaseModelAttributeInfo.java b/epoxy-processor/src/main/java/com/airbnb/epoxy/BaseModelAttributeInfo.java
@@ -3,7 +3,6 @@
 import com.airbnb.epoxy.EpoxyAttribute.Option;
 import com.squareup.javapoet.AnnotationSpec;
 import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.TypeName;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
@@ -146,8 +145,7 @@ private void findGetterAndSetterForPrivateField(ErrorLogger errorLogger) {
             || (methodName.equals(fieldName) && startsWithIs(fieldName)))
             && !method.getModifiers().contains(PRIVATE)
             && !method.getModifiers().contains(STATIC)
-            && method.getParameters().isEmpty()
-            && TypeName.get(method.getReturnType()).equals(getTypeName())) {
+            && method.getParameters().isEmpty()) {
           getterMethodName = methodName;
         }
         // check if it is a valid setter
@@ -156,8 +154,7 @@ private void findGetterAndSetterForPrivateField(ErrorLogger errorLogger) {
             fieldName.substring(2, fieldName.length())))))
             && !method.getModifiers().contains(PRIVATE)
             && !method.getModifiers().contains(STATIC)
-            && method.getParameters().size() == 1
-            && TypeName.get(method.getParameters().get(0).asType()).equals(getTypeName())) {
+            && method.getParameters().size() == 1) {
           setterMethodName = methodName;
         }
       }

diff --git a/epoxy-processortest/src/test/java/com/airbnb/epoxy/ModelProcessorTest.java b/epoxy-processortest/src/test/java/com/airbnb/epoxy/ModelProcessorTest.java
@@ -308,12 +308,6 @@ public void testModelWithPrivateAttributeWithGetterWithParamsFails() {
         "private fields without proper getter and setter");
   }
 
-  @Test
-  public void testModelWithPrivateAttributeWithGetterWithWrongReturnTypeFails() {
-    assertGenerationError("ModelWithPrivateFieldWithGetterWithWrongReturnType.java",
-        "private fields without proper getter and setter");
-  }
-
   @Test
   public void testModelWithPrivateAttributeWithPrivateSetterFails() {
     assertGenerationError("ModelWithPrivateFieldWithPrivateSetter.java",
@@ -332,12 +326,6 @@ public void testModelWithPrivateAttributeWithGetterWithoutParamsFails() {
         "private fields without proper getter and setter");
   }
 
-  @Test
-  public void testModelWithPrivateAttributeWithSetterWithWrongReturnTypeFails() {
-    assertGenerationError("ModelWithPrivateFieldWithSetterWithWrongParamType.java",
-        "private fields without proper getter and setter");
-  }
-
   @Test
   public void testModelWithAllPrivateFieldTypes() {
     assertGeneration("ModelWithAllPrivateFieldTypes.java", "ModelWithAllPrivateFieldTypes_.java");

diff --git a/...-processortest/src/test/resources/ModelWithPrivateFieldWithGetterWithWrongReturnType.java b/...-processortest/src/test/resources/ModelWithPrivateFieldWithGetterWithWrongReturnType.java
diff --git a/...y-processortest/src/test/resources/ModelWithPrivateFieldWithSetterWithWrongParamType.java b/...y-processortest/src/test/resources/ModelWithPrivateFieldWithSetterWithWrongParamType.java