Dev: fix SwiftBlock with primitives

Author: andriydruk

compiler/src/main/java/com/readdle/codegen/JavaSwiftProcessor.java

@@ -382,7 +382,7 @@ static String replaceLast(String text, char replace, char replacement) {
     }
 
     public SwiftEnvironment.Type parseJavaType(String javaType) {
-        if (moduleDescriptor.customTypeMappings.containsKey(javaType)) {
+        if (moduleDescriptor.customTypeMappings != null && moduleDescriptor.customTypeMappings.containsKey(javaType)) {
             return new SwiftEnvironment.Type(moduleDescriptor.customTypeMappings.get(javaType), javaType);
         }
         switch (javaType) {

compiler/src/main/java/com/readdle/codegen/SwiftBlockDescriptor.java

@@ -203,7 +203,8 @@ File generateCode() throws IOException {
 
         String jniMethodTemplate;
         if (returnSwiftType != null) {
-            jniMethodTemplate = "let optionalResult = JNI.CallObjectMethod(self.jniObject, %s.javaMethod%s";
+            String methodCallMethod = returnSwiftType.returnTypeFunc(isReturnTypeOptional);
+            jniMethodTemplate = "let optionalResult = JNI." + methodCallMethod + "(self.jniObject, %s.javaMethod%s";
         }
         else {
             jniMethodTemplate = "JNI.CallVoidMethod(self.jniObject, %s.javaMethod%s";
@@ -231,19 +232,29 @@ File generateCode() throws IOException {
         swiftWriter.emitStatement("}");
 
         if (returnSwiftType != null) {
-            swiftWriter.emitStatement("guard let result = optionalResult else {");
-            swiftWriter.emitStatement(isReturnTypeOptional ? "return nil" : "fatalError(\"Don't support nil here!\")");
-            swiftWriter.emitStatement("}");
-            swiftWriter.emitStatement("defer {");
-            swiftWriter.emitStatement("JNI.DeleteLocalRef(result)");
-            swiftWriter.emitStatement("}");
-            swiftWriter.emitStatement("do {");
-            swiftWriter.emitStatement(String.format("return try %s.from(javaObject: result)", returnSwiftType.swiftConstructorType));
-            swiftWriter.emitStatement("}");
-            swiftWriter.emitStatement("catch {");
-            swiftWriter.emitStatement("let errorString = String(reflecting: type(of: error)) + String(describing: error)");
-            swiftWriter.emitStatement("fatalError(errorString)");
-            swiftWriter.emitStatement("}");
+            if (!isReturnTypeOptional && returnSwiftType.isPrimitiveType()) {
+                swiftWriter.emitStatement("return " + returnSwiftType.swiftType + "(fromJavaPrimitive: optionalResult)");
+            }
+            else {
+                swiftWriter.emitStatement("guard let result = optionalResult else {");
+                if (isReturnTypeOptional) {
+                    swiftWriter.emitStatement("return nil");
+                } else {
+                    swiftWriter.emitStatement("fatalError(\"Don't support nil here!\")");
+                }
+                swiftWriter.emitStatement("}");
+
+                swiftWriter.emitStatement("defer {");
+                swiftWriter.emitStatement("JNI.DeleteLocalRef(result)");
+                swiftWriter.emitStatement("}");
+                swiftWriter.emitStatement("do {");
+                swiftWriter.emitStatement(String.format("return try %s.from(javaObject: result)", returnSwiftType.swiftConstructorType));
+                swiftWriter.emitStatement("}");
+                swiftWriter.emitStatement("catch {");
+                swiftWriter.emitStatement("let errorString = String(reflecting: type(of: error)) + String(describing: error)");
+                swiftWriter.emitStatement("fatalError(errorString)");
+                swiftWriter.emitStatement("}");
+            }
         }
 
         swiftWriter.emitStatement("}");

sample/build.gradle

@@ -5,8 +5,6 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
-apply plugin: 'kotlin-kapt'
-
 swift {
     useKapt true
     cleanEnabled true

sample/src/androidTest/java/com/readdle/swiftjava/sample/BoolTests.java

@@ -91,4 +91,14 @@ public void testDecode() {
         Assert.assertFalse(BoolTest.testDecode(badParam));
     }
 
+    @Test
+    public void testBlock() {
+        Assert.assertTrue(BoolTest.testBlock(value -> value));
+    }
+
+    @Test
+    public void testOptionalBlock() {
+        Assert.assertTrue(BoolTest.testOptionalBlock(value -> value));
+    }
+
 }

sample/src/androidTest/java/com/readdle/swiftjava/sample/DoubleTests.java

@@ -98,4 +98,14 @@ public void testDecode() {
         Assert.assertFalse(DoubleTest.testDecode(badParam));
     }
 
+    @Test
+    public void testBlock() {
+        Assert.assertTrue(DoubleTest.testBlock(value -> value));
+    }
+
+    @Test
+    public void testOptionalBoolBlock() {
+        Assert.assertTrue(DoubleTest.testOptionalBlock(value -> value));
+    }
+
 }

sample/src/androidTest/java/com/readdle/swiftjava/sample/FloatTests.java

@@ -98,4 +98,14 @@ public void testDecode() {
         Assert.assertFalse(FloatTest.testDecode(badParam));
     }
 
+    @Test
+    public void testBlock() {
+        Assert.assertTrue(FloatTest.testBlock(value -> value));
+    }
+
+    @Test
+    public void testOptionalBlock() {
+        Assert.assertTrue(FloatTest.testOptionalBlock(value -> value));
+    }
+
 }

sample/src/androidTest/java/com/readdle/swiftjava/sample/Int16Tests.java

@@ -124,4 +124,14 @@ public void testOptionSetDecode() {
         Assert.assertEquals(Int16OptionsSet.getThree().getRawValue(), Int16Test.testOptionSetDecode(Int16OptionsSet.getThree()));
     }
 
+    @Test
+    public void testBlock() {
+        Assert.assertTrue(Int16Test.testBlock(value -> value));
+    }
+
+    @Test
+    public void testOptionalBlock() {
+        Assert.assertTrue(Int16Test.testOptionalBlock(value -> value));
+    }
+
 }

sample/src/androidTest/java/com/readdle/swiftjava/sample/Int64Tests.java

@@ -124,4 +124,14 @@ public void testOptionSetDecode() {
         Assert.assertEquals(Int64OptionsSet.getThree().getRawValue(), Int64Test.testOptionSetDecode(Int64OptionsSet.getThree()));
     }
 
+    @Test
+    public void testBlock() {
+        Assert.assertTrue(Int64Test.testBlock(value -> value));
+    }
+
+    @Test
+    public void testOptionalBlock() {
+        Assert.assertTrue(Int64Test.testOptionalBlock(value -> value));
+    }
+
 }

sample/src/androidTest/java/com/readdle/swiftjava/sample/Int8Tests.java

@@ -124,4 +124,14 @@ public void testOptionSetDecode() {
         Assert.assertEquals(Int8OptionsSet.getThree().getRawValue(), Int8Test.testOptionSetDecode(Int8OptionsSet.getThree()));
     }
 
+    @Test
+    public void testBlock() {
+        Assert.assertTrue(Int8Test.testBlock(value -> value));
+    }
+
+    @Test
+    public void testOptionalBlock() {
+        Assert.assertTrue(Int8Test.testOptionalBlock(value -> value));
+    }
+
 }

sample/src/androidTest/java/com/readdle/swiftjava/sample/IntTests.java

@@ -144,4 +144,14 @@ public void testOptionSetDecode() {
         Assert.assertEquals(IntOptionsSet.getThree().getRawValue(), IntTest.testOptionSetDecode(IntOptionsSet.getThree()));
     }
 
+    @Test
+    public void testBlock() {
+        Assert.assertTrue(IntTest.testBlock(value -> value));
+    }
+
+    @Test
+    public void testOptionalBlock() {
+        Assert.assertTrue(IntTest.testOptionalBlock(value -> value));
+    }
+
 }