Ignores android.os.Parcelable and java.util.* from interface method g…

…eneration. afcastano#14

AutoValuePlugin.iml

@@ -7,7 +7,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
-    <orderEntry type="jdk" jdkName="IntelliJ IDEA Community Edition IC-143.382.35" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

CHANGELOG.md

@@ -1,3 +1,7 @@
+Release 20170208
+----------------
+* 2017-02-08: Ignores `android.os.Parcelable` and `java.util.*` from interface method generation. [#14](https://github.com/afcastano/AutoValuePlugin/issues/14)
+
 Release 20170203
 -------
 * 2017-02-03: Ignores `toBuilder` based on return type. [#15](https://github.com/afcastano/AutoValuePlugin/issues/15)

META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin version="2">
     <id>com.afcastano.intellij.autovalue</id>
     <name>AutoValue plugin</name>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <vendor email="[email protected]" url="https://github.com/afcastano/AutoValuePlugin">AutoValue plugin</vendor>
 
     <description><![CDATA[

src/com/afcastano/intellij/autovalue/generator/AutoValueFactory.java

@@ -34,7 +34,7 @@ public class AutoValueFactory {
                     "com.google.auto.value.AutoValue",
                     "auto.parcel.AutoParcel",
                     "auto.parcelgson.AutoParcelGson"
-                    );
+            );
 
     private PsiType builderType;
     private PsiClass builderClass;
@@ -435,7 +435,7 @@ public boolean containsCreateMethod() {
     @NotNull
     public List<PsiMethod> getAbstractGetters(PsiClass targetClass) {
         List<PsiMethod> abstractGetters = new ArrayList<>();
-        abstractGetters.addAll(implementingInterfaceGetters(targetClass));
+        abstractGetters.addAll(getGettersFromAllExtendedInterfaces(targetClass));
 
         for (PsiMethod psiMethod : targetClass.getMethods()) {
             abstractGetters = removeMethodByName(psiMethod.getName(), abstractGetters);
@@ -471,14 +471,17 @@ private boolean containsMethodByName(String name, List<PsiMethod> methods) {
         return false;
     }
 
-    private List<PsiMethod> implementingInterfaceGetters(PsiClass targetClass) {
+    private List<PsiMethod> getGettersFromAllExtendedInterfaces(PsiClass targetClass) {
         List<PsiMethod> abstractGetters = new ArrayList<>();
         PsiClass[] interfaces = targetClass.getInterfaces();
 
-        for (PsiClass interf : interfaces) {
-            List<PsiMethod> newGetters = getInterfaceGetters(interf);
+        for (PsiClass currentInterface : interfaces) {
+            if (isBlackListedInterface(currentInterface)) {
+                continue;
+            }
+            List<PsiMethod> interfaceGetters = gettersFromInterface(currentInterface);
 
-            for (PsiMethod method : newGetters) {
+            for (PsiMethod method : interfaceGetters) {
                 //If exists don't add it twice
                 if (containsMethodByName(method.getName(), abstractGetters)) {
                     continue;
@@ -492,10 +495,20 @@ private List<PsiMethod> implementingInterfaceGetters(PsiClass targetClass) {
         return abstractGetters;
     }
 
-    private List<PsiMethod> getInterfaceGetters(PsiClass interfaceClass) {
+    private boolean isBlackListedInterface(PsiClass psiInterface) {
+        String qualifiedName = psiInterface.getQualifiedName();
+        if(qualifiedName == null) {
+            return false;
+        }
+
+        return qualifiedName.equals("android.os.Parcelable")
+                || qualifiedName.startsWith("java.util.");
+    }
+
+    private List<PsiMethod> gettersFromInterface(PsiClass interfaceClass) {
         List<PsiMethod> abstractGetters = new ArrayList<>();
 
-        abstractGetters.addAll(implementingInterfaceGetters(interfaceClass));
+        abstractGetters.addAll(getGettersFromAllExtendedInterfaces(interfaceClass));
 
         for (PsiMethod psiMethod : interfaceClass.getMethods()) {
             //If exists don't add it twice
@@ -541,4 +554,4 @@ public static GetterProperties fromGetter(PsiMethod getter) {
         }
 
     }
-}
+}

test/com/afcastano/intellij/autovalue/AutoValuePluginBuilderTest.java

@@ -158,6 +158,15 @@ public void testGenerateBuilderWithInterfaceCorrectly() {
                 AUTOVALUE);
     }
 
+    public void testGenerateBuilderWithInterfaceIgnoringBlacklistedCorrectly() {
+        utils.runGenerateBuilderActions("generatebuilder/withinterfaceignoresblacklisted/BasicTestFile_expected.java",
+                "generatebuilder/withinterfaceignoresblacklisted/BasicTestFile.java",
+                "test/Interface1.java",
+                "java/util/Map.java",
+                "android/os/Parcelable.java",
+                AUTOVALUE);
+    }
+
     public void testGenerateBuilderWithInterfaceHierarchy() {
         utils.runGenerateBuilderActions("generatebuilder/withinterfacehierarchy/BasicTestFile_expected.java",
                 "generatebuilder/withinterfacehierarchy/BasicTestFile.java",

test/com/afcastano/intellij/autovalue/AutoValuePluginCreateMethodTest.java

@@ -120,4 +120,13 @@ public void testGenerateBuilderWithInterfaceHierarchy() {
                 AUTOVALUE);
     }
 
+    public void testGenerateBuilderWithInterfaceIgnoringBlacklisted() {
+        utils.runGenerateCreateMethodActions("generatecreatemethod/withinterfaceignoresblacklisted/BasicTestFile_expected.java",
+                "generatecreatemethod/withinterfaceignoresblacklisted/BasicTestFile.java",
+                "test/Interface1.java",
+                "java/util/Map.java",
+                "android/os/Parcelable.java",
+                AUTOVALUE);
+    }
+
 }

testData/android/os/Parcelable.java

@@ -0,0 +1,5 @@
+package android.os;
+
+public interface Parcelable {
+    int parcelableMethod();
+}

testData/generatebuilder/withinterfaceignoresblacklisted/BasicTestFile.java

@@ -0,0 +1,16 @@
+import com.google.auto.value.AutoValue;
+import test.Interface1;
+import android.os.Parcelable;
+import java.util.Map;
+
+@AutoValue
+public abstract class BasicTestFile implements Interface1, Parcelable, Map<String, String> {
+
+    <caret>
+    public abstract String value();
+
+    public Integer notAbstract() {
+        return 0;
+    }
+
+}

testData/generatebuilder/withinterfaceignoresblacklisted/BasicTestFile_expected.java

@@ -0,0 +1,30 @@
+import com.google.auto.value.AutoValue;
+import test.Interface1;
+import android.os.Parcelable;
+import java.util.Map;
+
+@AutoValue
+public abstract class BasicTestFile implements Interface1, Parcelable, Map<String, String> {
+
+
+    public abstract String value();
+
+    public Integer notAbstract() {
+        return 0;
+    }
+
+    public static Builder builder() {
+        return new AutoValue_BasicTestFile.Builder();
+    }
+
+    @AutoValue.Builder
+    public abstract static class Builder {
+        public abstract Builder method1Interface1(int method1Interface1);
+
+        public abstract Builder method2Interface1(int method2Interface1);
+
+        public abstract Builder value(String value);
+
+        public abstract BasicTestFile build();
+    }
+}

testData/generatecreatemethod/withinterfaceignoresblacklisted/BasicTestFile.java

@@ -0,0 +1,20 @@
+import com.google.auto.value.AutoValue;
+import test.Interface1;
+import android.os.Parcelable;
+import java.util.Map;
+
+@AutoValue
+public abstract class BasicTestFile implements Interface1, Parcelable, Map<String, String> {
+
+    <caret>
+    public abstract String value();
+
+    public int method1Interface2() {
+        return 3;
+    }
+
+    public Integer notAbstract() {
+        return 0;
+    }
+
+}

testData/generatecreatemethod/withinterfaceignoresblacklisted/BasicTestFile_expected.java

@@ -0,0 +1,24 @@
+import com.google.auto.value.AutoValue;
+import test.Interface1;
+import android.os.Parcelable;
+import java.util.Map;
+
+@AutoValue
+public abstract class BasicTestFile implements Interface1, Parcelable, Map<String, String> {
+
+
+    public abstract String value();
+
+    public int method1Interface2() {
+        return 3;
+    }
+
+    public Integer notAbstract() {
+        return 0;
+    }
+
+    public static BasicTestFile create(int method1Interface1, int method2Interface1, String value) {
+        return new AutoValue_BasicTestFile(method1Interface1, method2Interface1, value);
+    }
+
+}

testData/java/util/Map.java

@@ -0,0 +1,5 @@
+package java.util;
+
+public interface Map<K,V> {
+    String mapMethod();
+}