Fix unused codes

Author: anton-knyazev

moxy-compiler/src/main/java/com/omegar/mvp/compiler/entity/ViewInterfaceInfo.java

@@ -23,66 +23,66 @@
 @SuppressWarnings("NewApi")
 public class ViewInterfaceInfo implements TypeElementHolder {
     @Nullable
-    private final ViewInterfaceInfo superInterfaceInfo;
-    private final TypeElement element;
-    private final ClassName name;
-    private final List<TypeVariableName> typeVariables;
-    private final List<ViewMethod> methods;
+    private final TypeElement mSuperInterfaceType;
+    private final TypeElement mElement;
+    private final ClassName mName;
+    private final List<TypeVariableName> mTypeVariables;
+    private final List<ViewMethod> mMethods;
 
     public ViewInterfaceInfo(TypeElement element, List<ViewMethod> methods) {
         this(null, element, methods);
     }
 
-    public ViewInterfaceInfo(@Nullable ViewInterfaceInfo superInterfaceInfo, TypeElement element, List<ViewMethod> methods) {
-        this.superInterfaceInfo = superInterfaceInfo;
-        this.element = element;
-        this.name = ClassName.get(element);
-        this.methods = methods;
+    public ViewInterfaceInfo(@Nullable TypeElement superInterfaceType, TypeElement element, List<ViewMethod> methods) {
+        mSuperInterfaceType = superInterfaceType;
+        mElement = element;
+        mName = ClassName.get(element);
+        mMethods = methods;
 
-        this.typeVariables = element.getTypeParameters().stream()
+        mTypeVariables = element.getTypeParameters().stream()
                 .map(TypeVariableName::get)
                 .collect(Collectors.toList());
 
     }
 
     @Nullable
-    public ViewInterfaceInfo getSuperInterfaceInfo() {
-        return superInterfaceInfo;
+    public TypeElement getSuperInterfaceType() {
+        return mSuperInterfaceType;
     }
 
     public TypeElement getTypeElement() {
-        return element;
+        return mElement;
     }
 
     public ClassName getName() {
-        return name;
+        return mName;
     }
 
     public TypeName getNameWithTypeVariables() {
-        if (typeVariables.isEmpty()) {
-            return name;
+        if (mTypeVariables.isEmpty()) {
+            return mName;
         } else {
-            TypeVariableName[] names = new TypeVariableName[typeVariables.size()];
-            typeVariables.toArray(names);
+            TypeVariableName[] names = new TypeVariableName[mTypeVariables.size()];
+            mTypeVariables.toArray(names);
 
-            return ParameterizedTypeName.get(name, names);
+            return ParameterizedTypeName.get(mName, names);
         }
     }
 
     public List<TypeVariableName> getTypeVariables() {
-        return typeVariables;
+        return mTypeVariables;
     }
 
     public List<ViewMethod> getMethods() {
-        return methods;
+        return mMethods;
     }
 
     public String getViewStateFullName(Elements elements) {
-        return getViewStateFullName(elements, element);
+        return getViewStateFullName(elements, mElement);
     }
 
     public String getViewStateSimpleName(Elements elements) {
-        return getViewStateSimpleName(elements, element);
+        return getViewStateSimpleName(elements, mElement);
     }
 
     @Override
@@ -92,19 +92,19 @@ public boolean equals(Object o) {
 
         ViewInterfaceInfo that = (ViewInterfaceInfo) o;
 
-        return name != null ? name.equals(that.name) : that.name == null;
+        return mName != null ? mName.equals(that.mName) : that.mName == null;
     }
 
     @Override
     public int hashCode() {
-        return name != null ? name.hashCode() : 0;
+        return mName != null ? mName.hashCode() : 0;
     }
 
     @Override
     public String toString() {
         return "ViewInterfaceInfo{" +
-                "superInterfaceInfo=" + superInterfaceInfo +
-                ", element=" + element +
+                "superInterfaceInfo=" + mSuperInterfaceType +
+                ", element=" + mElement +
                 '}';
     }
 

moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ElementToViewInterfaceInfoProcessor.java

@@ -81,18 +81,20 @@ private Set<ViewInterfaceInfo> generateInfos(TypeElement element) {
 		getMethods(element, new ArrayList<>(), methods, element);
 
         // Add methods from super interfaces
-		ViewInterfaceInfo superInterfaceInfo = null;
+		TypeElement superInterfaceType = null;
+
 		for (TypeMirror typeMirror : element.getInterfaces()) {
 			final TypeElement interfaceElement = asElement(typeMirror);
 
 			if (interfaceElement != null && mTypes.isAssignable(interfaceElement.asType(), mMvpViewTypeMirror)) {
-				Set<ViewInterfaceInfo> parentInfos = generateInfos(interfaceElement);
-				if (superInterfaceInfo == null) {
-					superInterfaceInfo = Util.lastOrNull(parentInfos);
+				if (superInterfaceType == null) {
+					superInterfaceType = interfaceElement;
+					break;
 				}
-            }
+			}
 		}
 
+
 		// Allow methods be with same names
 		Map<String, Integer> methodsCounter = new HashMap<>();
 		for (ViewMethod method : methods) {
@@ -108,7 +110,7 @@ private Set<ViewInterfaceInfo> generateInfos(TypeElement element) {
 			methodsCounter.put(method.getName(), counter);
 		}
 
-		ViewInterfaceInfo info = new ViewInterfaceInfo(superInterfaceInfo, element, methods);
+		ViewInterfaceInfo info = new ViewInterfaceInfo(superInterfaceType, element, methods);
 		if (!info.getName().equals(MVP_VIEW_CLASS_NAME)) interfaceInfos.add(info);
 
 		return interfaceInfos;

moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceInfoToViewStateJavaFileProcessor.java

@@ -2,6 +2,7 @@
 
 import com.omegar.mvp.Moxy;
 import com.omegar.mvp.MvpProcessor;
+import com.omegar.mvp.MvpView;
 import com.omegar.mvp.compiler.entity.ViewInterfaceInfo;
 import com.omegar.mvp.compiler.entity.ViewMethod;
 import com.omegar.mvp.compiler.pipeline.JavaFileProcessor;
@@ -44,7 +45,9 @@
  */
 public final class ViewInterfaceInfoToViewStateJavaFileProcessor extends JavaFileProcessor<ViewInterfaceInfo> {
 
+
     private static final String VIEW = "Omega$$View";
+    private static final String CLASS_NAME_MVP_VIEW = MvpView.class.getCanonicalName();
     private static final TypeVariableName GENERIC_TYPE_VARIABLE_NAME = TypeVariableName.get(VIEW);
     private static final ClassName MVP_VIEW_STATE_CLASS_NAME = ClassName.get(MvpViewState.class);
     private static final ClassName VIEW_COMMAND_CLASS_NAME = ClassName.get(ViewCommand.class);
@@ -90,12 +93,12 @@ public JavaFile process(ViewInterfaceInfo viewInterfaceInfo) {
                     add(0, variableName);
                 }});
 
-        ViewInterfaceInfo superInfo = viewInterfaceInfo.getSuperInterfaceInfo();
+        TypeElement superInfoElement = viewInterfaceInfo.getSuperInterfaceType();
 
-        if (superInfo == null || superInfo.getTypeElement().getSimpleName().equals(MVP_VIEW_STATE_TYPE_NAME)) {
+        if (superInfoElement == null || superInfoElement.getQualifiedName().toString().equals(CLASS_NAME_MVP_VIEW)) {
             classBuilder.superclass(MVP_VIEW_STATE_TYPE_NAME);
         } else {
-            String superViewState = superInfo.getViewStateFullName(mElements);
+            String superViewState = ViewInterfaceInfo.getViewStateFullName(mElements, superInfoElement);
             ClassName superClassName = ClassName.bestGuess(superViewState);
             checkReflectorPackages(superViewState);
             classBuilder.superclass(