Dev: replace @SwiftParam with @swiftblock for PARAMETER

Author: andriydruk

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

@@ -161,6 +161,11 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         }
 
         for (Element annotatedElement : roundEnv.getElementsAnnotatedWith(SwiftBlock.class)) {
+            // Skip PARAMS
+            if (annotatedElement.getKind() == ElementKind.PARAMETER) {
+                continue;
+            }
+
             // Check if a class has been annotated with @SwiftValue
             if (annotatedElement.getKind() != ElementKind.INTERFACE) {
                 error(annotatedElement, "Only interface can be annotated with @%s", SwiftBlock.class.getSimpleName());

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

@@ -21,12 +21,13 @@
 
 class SwiftBlockDescriptor {
 
-    private static final String SUFFIX = "Android.swift";
+    private static final String SUFFIX = ".swift";
     private String swiftFilePath;
 
     private TypeElement annotatedClassElement;
     private String javaFullName;
     String simpleTypeName;
+    private String swiftType;
     private String[] importPackages;
 
     private String blockSignature;
@@ -57,8 +58,10 @@ class SwiftBlockDescriptor {
             javaFullName = classElement.getQualifiedName().toString().replace(".", "/");
         }
 
+        swiftType = "SwiftBlock" + simpleTypeName;
+
         try {
-            swiftFilePath = filer.createResource(StandardLocation.SOURCE_OUTPUT, FOLDER, simpleTypeName + SUFFIX, classElement).toUri().getPath();
+            swiftFilePath = filer.createResource(StandardLocation.SOURCE_OUTPUT, FOLDER, swiftType + SUFFIX, classElement).toUri().getPath();
         } catch (IOException e) {
             e.printStackTrace();
             throw new IllegalArgumentException("Can't create swift file");
@@ -109,8 +112,10 @@ File generateCode() throws IOException {
 
         swiftWriter.emitStatement(String.format("fileprivate let javaClass = JNI.GlobalFindClass(\"%s\")!", javaFullName));
 
+        swiftWriter.emitStatement(String.format("public typealias %s = %s", simpleTypeName, blockSignature));
+
         swiftWriter.emitEmptyLine();
-        swiftWriter.emit(String.format("public class %s", simpleTypeName));
+        swiftWriter.emit(String.format("public class %s", swiftType));
         swiftWriter.emit(" {\n");
 
         swiftWriter.emitEmptyLine();
@@ -129,8 +134,8 @@ File generateCode() throws IOException {
 
         swiftWriter.emitEmptyLine();
         swiftWriter.emitStatement("// Create swift object");
-        swiftWriter.emitStatement(String.format("public static func from(javaObject: jobject) throws -> %s {", blockSignature));
-        swiftWriter.emitStatement(String.format("return %s(jniObject: javaObject).block", simpleTypeName));
+        swiftWriter.emitStatement(String.format("public static func from(javaObject: jobject) throws -> %s {", simpleTypeName));
+        swiftWriter.emitStatement(String.format("return %s(jniObject: javaObject).block", swiftType));
         swiftWriter.emitStatement("}");
 
         swiftWriter.emitEmptyLine();
@@ -146,7 +151,7 @@ File generateCode() throws IOException {
                 sig));
 
         swiftWriter.emitEmptyLine();
-        swiftWriter.emitStatement(String.format("public lazy var block: %s = {", blockSignature));
+        swiftWriter.emitStatement(String.format("public lazy var block: %s = {", simpleTypeName));
 
         for (SwiftParamDescriptor param : params) {
             swiftWriter.emitStatement(String.format("let java_%s: JNIArgumentProtocol", param.name));
@@ -187,7 +192,7 @@ File generateCode() throws IOException {
             jniMethodTemplate = "JNI.CallVoidMethod(self.jniObject, %s.javaMethod%s";
         }
 
-        swiftWriter.emit(String.format(jniMethodTemplate, simpleTypeName, funcName));
+        swiftWriter.emit(String.format(jniMethodTemplate, swiftType, funcName));
 
         for (SwiftParamDescriptor param : params) {
             swiftWriter.emitStatement(String.format(", java_%s", param.name));

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

@@ -1,6 +1,6 @@
 package com.readdle.codegen;
 
-import com.readdle.codegen.anotation.SwiftParam;
+import com.readdle.codegen.anotation.SwiftBlock;
 
 import javax.lang.model.element.VariableElement;
 
@@ -14,9 +14,9 @@ public class SwiftParamDescriptor {
     SwiftParamDescriptor(VariableElement variableElement) {
         this.name = variableElement.getSimpleName().toString();
         this.swiftType = SwiftEnvironment.parseJavaType(variableElement.asType().toString());
-        SwiftParam swiftParam = variableElement.getAnnotation(SwiftParam.class);
+        SwiftBlock swiftParam = variableElement.getAnnotation(SwiftBlock.class);
         if (swiftParam != null) {
-            this.swiftType.swiftType = swiftParam.value();
+            this.swiftType.swiftConstructorType = "SwiftBlock" + this.swiftType.swiftConstructorType;
         }
         this.isOptional = JavaSwiftProcessor.isNullable(variableElement);
         this.description = null;

library/src/main/java/com/readdle/codegen/anotation/SwiftBlock.java

@@ -5,7 +5,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS)
+@Target({ElementType.TYPE, ElementType.PARAMETER}) @Retention(RetentionPolicy.CLASS)
 public @interface SwiftBlock {
 
     String value() default "";