Dev: fix Error construct

Author: andriydruk

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

@@ -182,7 +182,7 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType
 
         if (returnSwiftType != null) {
             swiftWriter.emitStatement("do {");
-            swiftWriter.emitStatement(String.format("return try %s.from(javaObject: result)", returnSwiftType.swiftType));
+            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)");

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

@@ -7,10 +7,18 @@ class SwiftEnvironment {
     static class Type {
         final String swiftType;
         final String javaPackage;
+        final String swiftConstructorType;
 
         Type(String swiftType, String javaPackage) {
             this.swiftType = swiftType;
             this.javaPackage = javaPackage;
+            this.swiftConstructorType = swiftType;
+        }
+
+        Type(String swiftType, String javaPackage, String swiftConstructorType) {
+            this.swiftType = swiftType;
+            this.javaPackage = javaPackage;
+            this.swiftConstructorType = swiftConstructorType;
         }
 
         @Override
@@ -47,7 +55,7 @@ public static Type parseJavaType(String javaType) {
             case "java.nio.ByteBuffer":
                 return new Type("Data", null);
             case "java.lang.Exception":
-                return new Type("Error", null);
+                return new Type("Error", null, "NSError");
             default:
                 try {
                     if (javaType.startsWith("java.util.ArrayList<")) {

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

@@ -99,13 +99,13 @@ void generateCode(SwiftWriter swiftWriter, String javaFullName, String swiftType
         for (SwiftParamDescriptor param : params) {
             if (param.isOptional) {
                 swiftWriter.emitStatement(String.format("if let j%1$s = j%1$s {", param.name));
-                swiftWriter.emitStatement(String.format("%1$s = try %2$s.from(javaObject: j%1$s)", param.name, param.swiftType.swiftType));
+                swiftWriter.emitStatement(String.format("%1$s = try %2$s.from(javaObject: j%1$s)", param.name, param.swiftType.swiftConstructorType));
                 swiftWriter.emitStatement("} else {");
                 swiftWriter.emitStatement(String.format("%s = nil", param.name));
                 swiftWriter.emitStatement("}");
             }
             else {
-                swiftWriter.emitStatement(String.format("%1$s = try %2$s.from(javaObject: j%1$s)", param.name, param.swiftType.swiftType));
+                swiftWriter.emitStatement(String.format("%1$s = try %2$s.from(javaObject: j%1$s)", param.name, param.swiftType.swiftConstructorType));
             }
         }
         swiftWriter.emitStatement("}");