[ADD] Support for different PackageFolder based on package when generate SwiftReferenceDescriptor

Author: kostassite

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

@@ -27,6 +27,7 @@
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Name;
+import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
@@ -330,6 +331,28 @@ private void generateJavaSwift(Filer filer) throws IOException {
         swiftWriter.close();
     }
 
+    String getPackageFolderForElement(Element classElement){
+        if (moduleDescriptor.packageFolderMappings == null){
+            return "";
+        }
+
+        Element currentPackage = classElement;
+        while (currentPackage.getKind() != ElementKind.PACKAGE) {
+            currentPackage = currentPackage.getEnclosingElement();
+        }
+        PackageElement packageElement = (PackageElement) currentPackage;
+
+        String packageName = moduleDescriptor.packageFolderMappings.get(packageElement.toString());
+
+        this.note("Package: " + packageElement.toString() + " - FolderName: " + packageName);
+
+        if (packageName == null){
+            return "";
+        }else {
+            return packageName + "/";
+        }
+    }
+
     void note(String msg) {
         messager.printMessage(Diagnostic.Kind.WARNING, msg);
     }

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

@@ -7,5 +7,5 @@ class SwiftModuleDescriptor {
     String moduleName;
     String[] importPackages;
     HashMap<String, String> customTypeMappings;
-
+    HashMap<String, String> packageFolderMappings;
 }

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

@@ -19,6 +19,7 @@
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.MirroredTypeException;
+import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 
 import static com.readdle.codegen.JavaSwiftProcessor.FOLDER;
@@ -49,19 +50,27 @@ class SwiftReferenceDescriptor {
             javaFullName = classElement.getQualifiedName().toString().replace(".", "/");
         }
 
-        try {
-            swiftFilePath = filer.createResource(StandardLocation.SOURCE_OUTPUT, FOLDER, simpleTypeName + SUFFIX, classElement).toUri().getPath();
-        } catch (IOException e) {
-            e.printStackTrace();
-            throw new IllegalArgumentException("Can't create swift file");
-        }
+
 
         Element enclosingElement = classElement.getEnclosingElement();
         while (enclosingElement != null && enclosingElement.getKind() == ElementKind.CLASS) {
             javaFullName = JavaSwiftProcessor.replaceLast(javaFullName, '/', '$');
             enclosingElement = enclosingElement.getEnclosingElement();
         }
 
+        try {
+            String packageFolder = processor.getPackageFolderForElement(enclosingElement);
+            File folder = new File(filer.getResource(StandardLocation.SOURCE_OUTPUT,  FOLDER, packageFolder + simpleTypeName + SUFFIX).toUri().getPath()).getParentFile();
+            if (!folder.exists()){
+                folder.mkdir();
+            }
+
+            swiftFilePath = filer.createResource(StandardLocation.SOURCE_OUTPUT, FOLDER, packageFolder + simpleTypeName + SUFFIX, classElement).toUri().getPath();
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new IllegalArgumentException("Can't create swift file" + e.getLocalizedMessage());
+        }
+
         // Check if it's an abstract class
         if (classElement.getModifiers().contains(Modifier.ABSTRACT)) {
             throw new IllegalArgumentException(String.format("The class %s is abstract. You can't annotate abstract classes with @%s",

sample/build.gradle

@@ -28,6 +28,9 @@ android {
                 arguments = ["com.readdle.codegen.package": """{
                    "moduleName": "SampleProject",
                    "importPackages": ["SampleAppCore"],
+                   "packageFolderMappings":{
+                            "io.kodika.android.TestPackage": "TestPackageKodika"
+                   },
                    "customTypeMappings": {
                            "com.readdle.swiftjava.sample.CustomSampleValue": "SampleValue"
                    }

sample/src/main/java/com/readdle/swiftjava/sample/SwiftReferenceWithCallback.kt renamed to sample/src/main/java/io/kodika/android/TestPackage/SwiftReferenceWithCallback.kt

@@ -1,4 +1,4 @@
-package com.readdle.swiftjava.sample
+package io.kodika.android.TestPackage
 
 import com.readdle.codegen.anotation.SwiftReference
 import com.readdle.codegen.anotation.SwiftCallbackFunc