Refactoring

Author: anton-knyazev

moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt

@@ -10,7 +10,7 @@ interface Contract {
 
         var value: String
 
-        @StateStrategyType(ADD_TO_END_SINGLE)
+        @StateStrategyType(ADD_TO_END_SINGLE, singleInstance = true)
         fun printLog(msg: D?, log: String?)
 
     }

moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java

@@ -187,6 +187,17 @@ public static String getAnnotationValueAsString(AnnotationMirror annotationMirro
 		}
 	}
 
+	public static boolean getAnnotationValueAsBoolean(AnnotationMirror annotationMirror, String key) {
+		AnnotationValue av = getAnnotationValue(annotationMirror, key);
+
+		if (av != null) {
+			return Boolean.parseBoolean(av.getValue().toString());
+		} else {
+			return false;
+		}
+	}
+
+
 	public static AnnotationValue getAnnotationValue(AnnotationMirror annotationMirror, String key) {
 		if (annotationMirror == null) return null;
 

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

@@ -21,16 +21,19 @@ public class CommandViewMethod extends ViewMethod {
 	private final String mUniqueSuffix;
 	private final TypeElement mStrategy;
 	private final String mTag;
+	private final boolean mSingleInstance;
 
 	public CommandViewMethod(Types types, DeclaredType targetInterfaceElement,
 							 ExecutableElement methodElement,
 							 TypeElement strategy,
 							 String tag,
-							 String uniqueSuffix) {
+							 String uniqueSuffix,
+							 boolean singleInstance) {
 		super(types, targetInterfaceElement, methodElement);
 		mStrategy = strategy;
 		mTag = tag;
 		mUniqueSuffix = uniqueSuffix;
+		mSingleInstance = singleInstance;
 	}
 
 	public TypeElement getStrategy() {
@@ -49,6 +52,10 @@ public String getCommandClassName() {
 		return Util.capitalizeString(getName()) + mUniqueSuffix + "Command";
 	}
 
+	public boolean isSingleInstance() {
+		return mSingleInstance;
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) return true;
@@ -57,11 +64,12 @@ public boolean equals(Object o) {
 		CommandViewMethod that = (CommandViewMethod) o;
 		return Objects.equals(mUniqueSuffix, that.mUniqueSuffix) &&
 				Objects.equals(mStrategy, that.mStrategy) &&
-				Objects.equals(mTag, that.mTag);
+				Objects.equals(mTag, that.mTag) &&
+				mSingleInstance == that.mSingleInstance;
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(super.hashCode(), mUniqueSuffix, mStrategy, mTag);
+		return Objects.hash(super.hashCode(), mUniqueSuffix, mStrategy, mTag, mSingleInstance);
 	}
 }

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

@@ -132,12 +132,16 @@ private List<ViewMethod> getMethods(TypeElement typeElement) {
                     // Allow methods be with same names
                     String uniqueSuffix = getUniqueSuffix(methodsCounter, methodElement);
 
+                    boolean singleInstance = Util.getAnnotationValueAsBoolean(annotation, "singleInstance");
+
                     return new CommandViewMethod(mTypes,
                             (DeclaredType) typeElement.asType(),
                             methodElement,
                             strategyClass,
                             methodTag,
-                            uniqueSuffix);
+                            uniqueSuffix,
+                            singleInstance
+                    );
 
                 });
 

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

@@ -52,7 +52,6 @@ public final class ViewInterfaceInfoToViewStateJavaFileProcessor extends JavaFil
     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);
-    private static final String STRATEGY_ADD_TO_END_SINGLE = AddToEndSingleStrategy.class.getSimpleName();
     private static final ParameterizedTypeName VIEW_COMMAND_TYPE_NAME
             = ParameterizedTypeName.get(VIEW_COMMAND_CLASS_NAME, GENERIC_TYPE_VARIABLE_NAME);
     private static final ParameterizedTypeName MVP_VIEW_STATE_TYPE_NAME
@@ -171,19 +170,18 @@ private TypeVariableName[] generateSuperClassTypeVariables(ViewInterfaceInfo vie
 
     private TypeSpec generateCommandClass(CommandViewMethod method, List<TypeVariableName> variableNames) {
         MethodSpec applyMethod = MethodSpec.methodBuilder("apply")
-                .addAnnotation(Override.class)
-                .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
+                .addModifiers(Modifier.PUBLIC)
                 .addParameter(GENERIC_TYPE_VARIABLE_NAME, "mvpView")
                 .addExceptions(method.getExceptions())
                 .addStatement("mvpView.$L($L)", method.getName(), method.getArgumentsString())
                 .build();
 
         MethodSpec.Builder updateMethodBuilder = null;
 
-        if (STRATEGY_ADD_TO_END_SINGLE.equals(method.getStrategy().getSimpleName().toString())) {
+        if (method.isSingleInstance()) {
 
             updateMethodBuilder = MethodSpec.methodBuilder("update")
-                    .addModifiers(Modifier.PRIVATE, Modifier.FINAL)
+                    .addModifiers(Modifier.PRIVATE)
                     .addParameters(method.getParameterSpecs());
 
             for (ParameterSpec typeVariable : method.getParameterSpecs()) {
@@ -218,7 +216,7 @@ private MethodSpec generateVoidMethod(DeclaredType enclosingType, CommandViewMet
         String commandClassName = method.getCommandClassName();
 
         MethodSpec.Builder builder = MethodSpec.overriding(method.getElement(), enclosingType, mTypes);
-        if (STRATEGY_ADD_TO_END_SINGLE.equals(method.getStrategy().getSimpleName().toString())) {
+        if (method.isSingleInstance()) {
             builder.addStatement("$1L command = findCommand($1L.class)", commandClassName)
                     .beginControlFlow("if (command == null)")
                     .addStatement("apply(new $1N($2L))", commandClass, method.getArgumentsString())
@@ -301,7 +299,6 @@ private MethodSpec generateToStringMethodSpec(CommandViewMethod method) {
         }
 
         return MethodSpec.methodBuilder("toString")
-                .addAnnotation(Override.class)
                 .addModifiers(Modifier.PUBLIC)
                 .returns(String.class)
                 .addStatement(statement.toString())

moxy/src/main/java/com/omegar/mvp/viewstate/strategy/StateStrategyType.java

@@ -22,4 +22,6 @@
 
 	String tag() default "";
 
+	boolean singleInstance() default false;
+
 }