Dev: add @SwiftModule annotation, remove all importPackages attributes

andriydruk · andriydruk · commit 58b421e19590 · 2018-01-22T12:52:51.000+02:00
diff --git a/compiler/src/main/java/com/readdle/codegen/JavaSwiftProcessor.java b/compiler/src/main/java/com/readdle/codegen/JavaSwiftProcessor.java
@@ -2,6 +2,7 @@
 
 import com.readdle.codegen.anotation.SwiftBlock;
 import com.readdle.codegen.anotation.SwiftDelegate;
+import com.readdle.codegen.anotation.SwiftModule;
 import com.readdle.codegen.anotation.SwiftReference;
 import com.readdle.codegen.anotation.SwiftValue;
 
@@ -42,6 +43,9 @@ interface WritableElement {
     private Filer filer;
     private Messager messager;
 
+    private String moduleName;
+    private String[] importPackages;
+
     @Override
     public synchronized void init(ProcessingEnvironment processingEnv) {
         super.init(processingEnv);
@@ -83,6 +87,16 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         Map<String, SwiftDelegateDescriptor> swiftDelegates = new HashMap<>();
         Map<String, SwiftBlockDescriptor> swiftBlocks = new HashMap<>();
 
+        for (Element annotatedElement : roundEnv.getElementsAnnotatedWith(SwiftModule.class)) {
+            SwiftModule swiftModule = annotatedElement.getAnnotation(SwiftModule.class);
+            moduleName = swiftModule.moduleName();
+            importPackages = swiftModule.importPackages();
+        }
+
+        if (moduleName == null || importPackages == null) {
+            messager.printMessage(Diagnostic.Kind.ERROR, "No package description with SwiftModule.class", null);
+        }
+
         for (Element annotatedElement : roundEnv.getElementsAnnotatedWith(SwiftValue.class)) {
             // Check if a class has been annotated with @SwiftValue
             if (annotatedElement.getKind() != ElementKind.CLASS) {
@@ -94,7 +108,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             TypeElement typeElement = (TypeElement) annotatedElement;
 
             try {
-                SwiftValueDescriptor swiftValueDescriptor = new SwiftValueDescriptor(typeElement, filer);
+                SwiftValueDescriptor swiftValueDescriptor = new SwiftValueDescriptor(typeElement, filer, importPackages);
                 swiftValues.put(swiftValueDescriptor.getSwiftType(), swiftValueDescriptor);
             }
             catch (IllegalArgumentException e) {
@@ -115,7 +129,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             TypeElement typeElement = (TypeElement) annotatedElement;
 
             try {
-                SwiftReferenceDescriptor swiftReferenceDescriptor = new SwiftReferenceDescriptor(typeElement, filer);
+                SwiftReferenceDescriptor swiftReferenceDescriptor = new SwiftReferenceDescriptor(typeElement, filer, importPackages);
                 swiftReferences.put(swiftReferenceDescriptor.getSwiftType(), swiftReferenceDescriptor);
             }
             catch (IllegalArgumentException e) {
@@ -136,7 +150,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             TypeElement typeElement = (TypeElement) annotatedElement;
 
             try {
-                SwiftDelegateDescriptor delegateDescriptor = new SwiftDelegateDescriptor(typeElement, filer);
+                SwiftDelegateDescriptor delegateDescriptor = new SwiftDelegateDescriptor(typeElement, filer, importPackages);
                 swiftDelegates.put(delegateDescriptor.simpleTypeName, delegateDescriptor);
             }
             catch (IllegalArgumentException e) {
@@ -157,7 +171,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             TypeElement typeElement = (TypeElement) annotatedElement;
 
             try {
-                SwiftBlockDescriptor blockDescriptor = new SwiftBlockDescriptor(typeElement, filer);
+                SwiftBlockDescriptor blockDescriptor = new SwiftBlockDescriptor(typeElement, filer, importPackages);
                 swiftBlocks.put(blockDescriptor.simpleTypeName, blockDescriptor);
             }
             catch (IllegalArgumentException e) {
diff --git a/compiler/src/main/java/com/readdle/codegen/SwiftBlockDescriptor.java b/compiler/src/main/java/com/readdle/codegen/SwiftBlockDescriptor.java
@@ -39,14 +39,14 @@ class SwiftBlockDescriptor {
     private String sig;
     private List<SwiftParamDescriptor> params = new LinkedList<>();
 
-    SwiftBlockDescriptor(TypeElement classElement, Filer filer) throws IllegalArgumentException {
+    SwiftBlockDescriptor(TypeElement classElement, Filer filer, String[] importPackages) throws IllegalArgumentException {
         this.annotatedClassElement = classElement;
+        this.importPackages = importPackages;
 
         // Get the full QualifiedTypeName
         try {
             SwiftBlock annotation = classElement.getAnnotation(SwiftBlock.class);
-            importPackages = annotation.importPackages();
-            blockSignature = annotation.signature();
+            blockSignature = annotation.value();
             simpleTypeName = classElement.getSimpleName().toString();
             javaFullName = classElement.getQualifiedName().toString().replace(".", "/");
 
diff --git a/compiler/src/main/java/com/readdle/codegen/SwiftDelegateDescriptor.java b/compiler/src/main/java/com/readdle/codegen/SwiftDelegateDescriptor.java
@@ -38,14 +38,14 @@ class SwiftDelegateDescriptor {
 
     private boolean isInterface;
 
-    SwiftDelegateDescriptor(TypeElement classElement, Filer filer) throws IllegalArgumentException {
+    SwiftDelegateDescriptor(TypeElement classElement, Filer filer, String[] importPackages) throws IllegalArgumentException {
         this.annotatedClassElement = classElement;
         this.isInterface = classElement.getKind() == ElementKind.INTERFACE;
+        this.importPackages = importPackages;
 
         // Get the full QualifiedTypeName
         try {
             SwiftDelegate annotation = classElement.getAnnotation(SwiftDelegate.class);
-            importPackages = annotation.importPackages();
             protocols = annotation.protocols();
             simpleTypeName = classElement.getSimpleName().toString();
             javaFullName = classElement.getQualifiedName().toString().replace(".", "/");
diff --git a/compiler/src/main/java/com/readdle/codegen/SwiftModuleDescriptor.java b/compiler/src/main/java/com/readdle/codegen/SwiftModuleDescriptor.java
@@ -0,0 +1,8 @@
+package com.readdle.codegen;
+
+public class SwiftModuleDescriptor {
+
+    private String moduleName;
+    private String[] imports;
+
+}
diff --git a/compiler/src/main/java/com/readdle/codegen/SwiftReferenceDescriptor.java b/compiler/src/main/java/com/readdle/codegen/SwiftReferenceDescriptor.java
@@ -34,13 +34,12 @@ class SwiftReferenceDescriptor {
 
     List<JavaSwiftProcessor.WritableElement> functions = new LinkedList<>();
 
-    SwiftReferenceDescriptor(TypeElement classElement, Filer filer) throws IllegalArgumentException {
+    SwiftReferenceDescriptor(TypeElement classElement, Filer filer, String[] importPackages) throws IllegalArgumentException {
         this.annotatedClassElement = classElement;
+        this.importPackages = importPackages;
 
         // Get the full QualifiedTypeName
         try {
-            SwiftReference annotation = classElement.getAnnotation(SwiftReference.class);
-            importPackages = annotation.importPackages();
             simpleTypeName = classElement.getSimpleName().toString();
             javaFullName = classElement.getQualifiedName().toString().replace(".", "/");
         } catch (MirroredTypeException mte) {
diff --git a/compiler/src/main/java/com/readdle/codegen/SwiftValueDescriptor.java b/compiler/src/main/java/com/readdle/codegen/SwiftValueDescriptor.java
@@ -32,13 +32,12 @@ class SwiftValueDescriptor {
 
     List<SwiftFuncDescriptor> functions = new LinkedList<>();
 
-    SwiftValueDescriptor(TypeElement classElement, Filer filer) throws IllegalArgumentException {
+    SwiftValueDescriptor(TypeElement classElement, Filer filer, String[] importPackages) throws IllegalArgumentException {
         this.annotatedClassElement = classElement;
+        this.importPackages = importPackages;
 
         // Get the full QualifiedTypeName
         try {
-            SwiftValue annotation = classElement.getAnnotation(SwiftValue.class);
-            importPackages = annotation.importPackages();
             simpleTypeName = classElement.getSimpleName().toString();
             javaPackage = classElement.getQualifiedName().toString().replace("." + simpleTypeName, "");
             javaFullName = classElement.getQualifiedName().toString().replace(".", "/");
diff --git a/library/src/main/java/com/readdle/codegen/anotation/SwiftBlock.java b/library/src/main/java/com/readdle/codegen/anotation/SwiftBlock.java
@@ -8,8 +8,6 @@
 @Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS)
 public @interface SwiftBlock {
 
-    String[] importPackages() default {};
-
-    String signature() default "";
+    String value() default "";
 
 }
diff --git a/library/src/main/java/com/readdle/codegen/anotation/SwiftDelegate.java b/library/src/main/java/com/readdle/codegen/anotation/SwiftDelegate.java
@@ -9,8 +9,6 @@
 @Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS)
 public @interface SwiftDelegate {
 
-    String[] importPackages() default {};
-
     String[] protocols() default {};
 
 }
diff --git a/library/src/main/java/com/readdle/codegen/anotation/SwiftModule.java b/library/src/main/java/com/readdle/codegen/anotation/SwiftModule.java
@@ -0,0 +1,17 @@
+package com.readdle.codegen.anotation;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.PACKAGE)
+public @interface SwiftModule {
+
+    String moduleName() default "";
+
+    String[] importPackages() default {};
+
+}
diff --git a/library/src/main/java/com/readdle/codegen/anotation/SwiftReference.java b/library/src/main/java/com/readdle/codegen/anotation/SwiftReference.java
@@ -8,6 +8,4 @@
 @Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS)
 public @interface SwiftReference {
 
-    String[] importPackages() default {};
-
 }
diff --git a/library/src/main/java/com/readdle/codegen/anotation/SwiftValue.java b/library/src/main/java/com/readdle/codegen/anotation/SwiftValue.java
@@ -8,6 +8,4 @@
 @Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS)
 public @interface SwiftValue {
 
-    String[] importPackages() default {};
-
 }

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@`
`8`	`8`	`@Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS)`
`9`	`9`	`public @interface SwiftBlock {`
`10`	`10`
`11`		`- String[] importPackages() default {};`
`12`		`-`
`13`		`- String signature() default "";`
	`11`	`+ String value() default "";`
`14`	`12`
`15`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,6 @@`
`9`	`9`	`@Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS)`
`10`	`10`	`public @interface SwiftDelegate {`
`11`	`11`
`12`		`- String[] importPackages() default {};`
`13`		`-`
`14`	`12`	`String[] protocols() default {};`
`15`	`13`
`16`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,4 @@`
`8`	`8`	`@Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS)`
`9`	`9`	`public @interface SwiftReference {`
`10`	`10`
`11`		`- String[] importPackages() default {};`
`12`		`-`
`13`	`11`	`}`