Merge pull request #29 from Omega-R/develop

Fix getter method

Author: anton-knyazev

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

@@ -178,7 +178,12 @@ private ExecutableElement getSetterElement(ExecutableElement getterElement,
             if (setterElement.getSimpleName().contentEquals(setterMethod)) {
                 List<? extends VariableElement> parameters = setterElement.getParameters();
                 if (parameters.size() == 1) {
-                    if (parameters.get(0).asType().equals(getterElement.getReturnType())) {
+                    TypeMirror paramTypeMirror = parameters.get(0).asType();
+                    if (paramTypeMirror instanceof DeclaredType) {
+                        if (((DeclaredType) paramTypeMirror).asElement().equals(Util.asElement(getterElement.getReturnType()))) {
+                            return setterElement;
+                        }
+                    } else if (parameters.get(0).asType().equals(getterElement.getReturnType())) {
                         return setterElement;
                     }
                 }

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

@@ -221,14 +221,32 @@ private MethodSpec generateVoidMethod(DeclaredType enclosingType, CommandViewMet
 
     private MethodSpec generateReturnMethod(DeclaredType enclosingType, ReturnViewMethod method, CommandViewMethod commandViewMethod) {
         String commandClassName = commandViewMethod.getCommandClassName();
-        return MethodSpec.overriding(method.getElement(), enclosingType, mTypes)
+        MethodSpec.Builder builder = MethodSpec.overriding(method.getElement(), enclosingType, mTypes)
                 .beginControlFlow("for ($L viewCommand : mViewCommands.getCurrentState())", VIEW_COMMAND_CLASS_NAME)
                 .beginControlFlow("if (viewCommand instanceof $L)", commandClassName)
                 .addStatement("return (($L) viewCommand).$L", commandClassName, commandViewMethod.getArgumentsString())
                 .endControlFlow()
-                .endControlFlow()
-                .addStatement("return null")
-                .build();
+                .endControlFlow();
+
+        switch (method.getReturnType().getKind()) {
+            case BOOLEAN:
+                builder.addStatement("return false");
+                break;
+            case BYTE:
+            case SHORT:
+            case INT:
+            case LONG:
+            case FLOAT:
+            case CHAR:
+            case DOUBLE:
+                builder.addStatement("return 0");
+                break;
+            default:
+                builder.addStatement("return null");
+                break;
+        }
+
+        return builder.build();
     }
 
     private MethodSpec generateCommandConstructor(CommandViewMethod method) {