Merge branch 'develop'

anton-knyazev · anton-knyazev · commit ae6ec6bbb5c8 · 2019-12-11T11:33:28.000+03:00
* develop:
  Remove possible annotate StateStrategyType for interface Remove deprecreated annotation GenerateViewState
diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java
@@ -4,9 +4,9 @@
 import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy;
 import com.omegar.mvp.viewstate.strategy.StateStrategyType;
 
-@StateStrategyType(AddToEndSingleStrategy.class)
 public interface BaseView extends MvpView {
 
+    @StateStrategyType(AddToEndSingleStrategy.class)
     void testFunction();
 
 }
diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt
@@ -9,9 +9,9 @@ import example.com.moxy_androidx_sample.second.SecondView
 
 interface Contract {
 
-    @StateStrategyType(AddToEndSingleStrategy::class)
     interface MainView : FirstView<Item>, SecondView, Contract.FifthView {
 
+        @StateStrategyType(AddToEndSingleStrategy::class)
         fun printLog(msg: Double?, log: String?)
 
     }
diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java
@@ -7,7 +7,6 @@
 
 public interface Contract {
 
-    @StateStrategyType(AddToEndSingleStrategy.class)
     interface FifthView extends FourthView<String> {
 
     }
diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java
@@ -10,13 +10,15 @@
 import example.com.moxy_androidx_sample.BaseView;
 import example.com.moxy_androidx_sample.third.ThirdView;
 
-@StateStrategyType(AddToEndSingleStrategy.class)
 public interface FirstView<M> extends BaseView, ThirdView {
 
+    @StateStrategyType(AddToEndSingleStrategy.class)
     void firstMethod(List<M> item);
 
+    @StateStrategyType(AddToEndSingleStrategy.class)
     void firstCopyMethod(List<Location> item);
 
+    @StateStrategyType(AddToEndSingleStrategy.class)
     void firstLog(M m);
 
 }
diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt
@@ -4,9 +4,9 @@ import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy
 import com.omegar.mvp.viewstate.strategy.StateStrategyType
 import example.com.moxy_androidx_sample.BaseView
 
-@StateStrategyType(AddToEndSingleStrategy::class)
 interface FourthView<R> : BaseView {
 
+    @StateStrategyType(AddToEndSingleStrategy::class)
     fun fourth(item: R)
 
 }
diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java
@@ -5,9 +5,9 @@
 
 import example.com.moxy_androidx_sample.BaseView;
 
-@StateStrategyType(AddToEndSingleStrategy.class)
 public interface SecondView extends BaseView {
 
+    @StateStrategyType(AddToEndSingleStrategy.class)
     void secondMethod();
 
 }
diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java
@@ -5,9 +5,9 @@
 
 import example.com.moxy_androidx_sample.BaseView;
 
-@StateStrategyType(AddToEndSingleStrategy.class)
 public interface ThirdView extends BaseView {
 
+    @StateStrategyType(AddToEndSingleStrategy.class)
     void thirdMethod();
 
 }
diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java
@@ -1,7 +1,6 @@
 package com.omegar.mvp.compiler;
 
 import com.google.auto.service.AutoService;
-import com.omegar.mvp.GenerateViewState;
 import com.omegar.mvp.InjectViewState;
 import com.omegar.mvp.RegisterMoxyReflectorPackages;
 import com.omegar.mvp.compiler.presenterbinder.InjectPresenterProcessor;
@@ -95,8 +94,7 @@ public Set<String> getSupportedAnnotationTypes() {
 		Collections.addAll(supportedAnnotationTypes,
 				InjectPresenter.class.getCanonicalName(),
 				InjectViewState.class.getCanonicalName(),
-				RegisterMoxyReflectorPackages.class.getCanonicalName(),
-				GenerateViewState.class.getCanonicalName());
+				RegisterMoxyReflectorPackages.class.getCanonicalName());
 		return supportedAnnotationTypes;
 	}
 
diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java
@@ -22,7 +22,6 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.TypeParameterElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
@@ -115,10 +114,8 @@ private Set<ViewInterfaceInfo> generateInfos(TypeElement element) {
 
 		List<ViewMethod> methods = new ArrayList<>();
 
-		TypeElement interfaceStateStrategyType = getInterfaceStateStrategyType(element);
-
 		// Get methods for input class
-		getMethods(element, interfaceStateStrategyType, new ArrayList<>(), methods);
+		getMethods(element, new ArrayList<>(), methods);
 
         // Add methods from super interfaces
 		ViewInterfaceInfo superInterfaceInfo = null;
@@ -155,7 +152,6 @@ private Set<ViewInterfaceInfo> generateInfos(TypeElement element) {
 	}
 
 	private void getMethods(TypeElement typeElement,
-	                        TypeElement parentStrategy,
 	                        List<ViewMethod> rootMethods,
 	                        List<ViewMethod> superinterfacesMethods) {
 		for (Element element : typeElement.getEnclosedElements()) {
@@ -187,22 +183,19 @@ private void getMethods(TypeElement typeElement,
 			if (strategyClassFromAnnotation != null) {
 				strategyClass = (TypeElement) ((DeclaredType) strategyClassFromAnnotation).asElement();
 			} else {
-				if (parentStrategy != null) {
-					strategyClass = parentStrategy;
-				} else {
-					String message = String.format("You are trying generate ViewState for %s. " +
-									"But %s interface and \"%s\" method don't provide Strategy type. " +
-									"Please annotate your %s interface or method with Strategy." + "\n\n" +
-									"For example:\n@StateStrategyType(AddToEndSingleStrategy::class)" + "\n" + "fun %s",
-							typeElement.getSimpleName(),
-							typeElement.getSimpleName(),
-							methodElement.getSimpleName(),
-							typeElement.getSimpleName(),
-							methodElement.getSimpleName()
-					);
-					MvpCompiler.getMessager().printMessage(Diagnostic.Kind.ERROR, message);
-					return;
-				}
+				String message = String.format("You are trying generate ViewState for %s. " +
+								"But %s interface and \"%s\" method don't provide Strategy type. " +
+								"Please annotate your %s interface or method with Strategy." + "\n\n" +
+								"For example:\n@StateStrategyType(AddToEndSingleStrategy::class)" + "\n" + "fun %s",
+						typeElement.getSimpleName(),
+						typeElement.getSimpleName(),
+						methodElement.getSimpleName(),
+						typeElement.getSimpleName(),
+						methodElement.getSimpleName()
+				);
+				MvpCompiler.getMessager().printMessage(Diagnostic.Kind.ERROR, message);
+				return;
+
 			}
 
 			// get tag from annotation
@@ -259,37 +252,6 @@ private void checkStrategyAndTagEquals(ViewMethod method, ViewMethod existingMet
 		}
 	}
 
-	private List<ViewMethod> iterateInterfaces(TypeElement parentElement,
-	                                           TypeElement parentDefaultStrategy,
-	                                           List<ViewMethod> rootMethods,
-	                                           List<ViewMethod> superinterfacesMethods) {
-		for (TypeMirror typeMirror : parentElement.getInterfaces()) {
-			final TypeElement anInterface = (TypeElement) ((DeclaredType) typeMirror).asElement();
 
-			final List<? extends TypeMirror> typeArguments = ((DeclaredType) typeMirror).getTypeArguments();
-			final List<? extends TypeParameterElement> typeParameters = anInterface.getTypeParameters();
 
-			if (typeArguments.size() > typeParameters.size()) {
-				throw new IllegalArgumentException("Code generation for interface " + anInterface.getSimpleName() + " failed. Simplify your generics.");
-			}
-
-			TypeElement defaultStrategy = parentDefaultStrategy != null ? parentDefaultStrategy : getInterfaceStateStrategyType(anInterface);
-
-			getMethods(anInterface, defaultStrategy, rootMethods, superinterfacesMethods);
-
-			iterateInterfaces(anInterface, defaultStrategy, rootMethods, superinterfacesMethods);
-		}
-
-		return superinterfacesMethods;
-	}
-
-	private TypeElement getInterfaceStateStrategyType(TypeElement typeElement) {
-		AnnotationMirror annotation = Util.getAnnotation(typeElement, STATE_STRATEGY_TYPE_ANNOTATION);
-		TypeMirror value = Util.getAnnotationValueAsTypeMirror(annotation, "value");
-		if (value != null && value.getKind() == TypeKind.DECLARED) {
-			return (TypeElement) ((DeclaredType) value).asElement();
-		} else {
-			return null;
-		}
-	}
 }
diff --git a/moxy-compiler/src/test/resources/view/strategies_inheritance/ChildView.java b/moxy-compiler/src/test/resources/view/strategies_inheritance/ChildView.java
@@ -5,13 +5,14 @@
 import view.strategies_inheritance.strategies.ChildDefaultStrategy;
 import view.strategies_inheritance.strategies.Strategy2;
 
-@StateStrategyType(ChildDefaultStrategy.class)
 public interface ChildView extends ParentView {
+	@StateStrategyType(ChildDefaultStrategy.class)
 	void parentMethod1(); // ParentDefaultStrategy -> ChildDefaultStrategy
 
 	@StateStrategyType(Strategy2.class)
 	void parentMethod2(); // ParentDefaultStrategy -> Strategy2
 
+	@StateStrategyType(ChildDefaultStrategy.class)
 	void childMethod(); // ChildDefaultStrategy
 
 	@StateStrategyType(Strategy2.class)
diff --git a/moxy-compiler/src/test/resources/view/strategies_inheritance/ParentView.java b/moxy-compiler/src/test/resources/view/strategies_inheritance/ParentView.java
@@ -6,12 +6,14 @@
 import view.strategies_inheritance.strategies.ParentDefaultStrategy;
 import view.strategies_inheritance.strategies.Strategy1;
 
-@StateStrategyType(ParentDefaultStrategy.class)
 public interface ParentView extends MvpView {
+	@StateStrategyType(ParentDefaultStrategy.class)
 	void parentMethod1(); // ParentDefaultStrategy
 
+	@StateStrategyType(ParentDefaultStrategy.class)
 	void parentMethod2(); // ParentDefaultStrategy
 
+	@StateStrategyType(ParentDefaultStrategy.class)
 	void parentMethod3(); // ParentDefaultStrategy
 
 	@StateStrategyType(Strategy1.class)
diff --git a/moxy/src/main/java/com/omegar/mvp/GenerateViewState.java b/moxy/src/main/java/com/omegar/mvp/GenerateViewState.java
diff --git a/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/StateStrategyType.java b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/StateStrategyType.java
@@ -12,7 +12,7 @@
  * @author Yuri Shmakov
  * @author Alexander Blinov
  */
-@Target(value = {ElementType.TYPE, ElementType.METHOD})
+@Target(value = {ElementType.METHOD})
 @Retention(value = RetentionPolicy.RUNTIME)
 public @interface StateStrategyType {
 	Class<? extends StateStrategy> value();
diff --git a/moxy/src/test/java/com/omegar/mvp/view/ChildView.java b/moxy/src/test/java/com/omegar/mvp/view/ChildView.java
@@ -1,6 +1,5 @@
 package com.omegar.mvp.view;
 
-import com.omegar.mvp.GenerateViewState;
 import com.omegar.mvp.viewstate.strategy.SkipStrategy;
 import com.omegar.mvp.viewstate.strategy.StateStrategyType;
 
@@ -10,7 +9,6 @@
  *
  * @author Savin Mikhail
  */
-@GenerateViewState
 @StateStrategyType(SkipStrategy.class)
 public interface ChildView extends ParentView, SimpleInterface {
 	@Override
diff --git a/moxy/src/test/java/com/omegar/mvp/view/ParentView.java b/moxy/src/test/java/com/omegar/mvp/view/ParentView.java
@@ -1,6 +1,5 @@
 package com.omegar.mvp.view;
 
-import com.omegar.mvp.GenerateViewState;
 import com.omegar.mvp.MvpView;
 import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy;
 import com.omegar.mvp.viewstate.strategy.StateStrategyType;
@@ -11,7 +10,6 @@
  *
  * @author Savin Mikhail
  */
-@GenerateViewState
 public interface ParentView extends MvpView {
 	void withoutStrategyMethod();
 
diff --git a/moxy/src/test/resources/view/ViewStateChildWithIncorrectStrategyTagView.java b/moxy/src/test/resources/view/ViewStateChildWithIncorrectStrategyTagView.java
@@ -1,14 +1,12 @@
 package view;
 
-import com.omegar.mvp.GenerateViewState;
 
 /**
  * Date: 26.02.2016
  * Time: 12:09
  *
  * @author Savin Mikhail
  */
-@GenerateViewState
 public interface ViewStateChildWithIncorrectStrategyTagView extends ViewStateParentView, ViewStateParentStrategyTagView {
 
 }
diff --git a/moxy/src/test/resources/view/ViewStateForClassView.java b/moxy/src/test/resources/view/ViewStateForClassView.java
@@ -1,6 +1,5 @@
 package view;
 
-import com.omegar.mvp.GenerateViewState;
 import com.omegar.mvp.MvpView;
 
 /**
@@ -9,7 +8,6 @@
  *
  * @author Savin Mikhail
  */
-@GenerateViewState
 public class ViewStateForClassView implements MvpView {
 	public void showProgress() {
 
diff --git a/moxy/src/test/resources/view/ViewStateForNotView.java b/moxy/src/test/resources/view/ViewStateForNotView.java
@@ -1,13 +1,10 @@
 package view;
 
-import com.omegar.mvp.GenerateViewState;
-
 /**
  * Date: 26.02.2016
  * Time: 11:08
  *
  * @author Savin Mikhail
  */
-@GenerateViewState
 public interface ViewStateForNotView {
 }

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`	`import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy;`
`5`	`5`	`import com.omegar.mvp.viewstate.strategy.StateStrategyType;`
`6`	`6`
`7`		`-@StateStrategyType(AddToEndSingleStrategy.class)`
`8`	`7`	`public interface BaseView extends MvpView {`
`9`	`8`
	`9`	`+ @StateStrategyType(AddToEndSingleStrategy.class)`
`10`	`10`	`void testFunction();`
`11`	`11`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ import example.com.moxy_androidx_sample.second.SecondView`
`9`	`9`
`10`	`10`	`interface Contract {`
`11`	`11`
`12`		`- @StateStrategyType(AddToEndSingleStrategy::class)`
`13`	`12`	`interface MainView : FirstView<Item>, SecondView, Contract.FifthView {`
`14`	`13`
	`14`	`+ @StateStrategyType(AddToEndSingleStrategy::class)`
`15`	`15`	`fun printLog(msg: Double?, log: String?)`
`16`	`16`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`public interface Contract {`
`9`	`9`
`10`		`- @StateStrategyType(AddToEndSingleStrategy.class)`
`11`	`10`	`interface FifthView extends FourthView<String> {`
`12`	`11`
`13`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@ import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy`
`4`	`4`	`import com.omegar.mvp.viewstate.strategy.StateStrategyType`
`5`	`5`	`import example.com.moxy_androidx_sample.BaseView`
`6`	`6`
`7`		`-@StateStrategyType(AddToEndSingleStrategy::class)`
`8`	`7`	`interface FourthView<R> : BaseView {`
`9`	`8`
	`9`	`+ @StateStrategyType(AddToEndSingleStrategy::class)`
`10`	`10`	`fun fourth(item: R)`
`11`	`11`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`
`6`	`6`	`import example.com.moxy_androidx_sample.BaseView;`
`7`	`7`
`8`		`-@StateStrategyType(AddToEndSingleStrategy.class)`
`9`	`8`	`public interface SecondView extends BaseView {`
`10`	`9`
	`10`	`+ @StateStrategyType(AddToEndSingleStrategy.class)`
`11`	`11`	`void secondMethod();`
`12`	`12`
`13`	`13`	`}`