Dev: fix wrong getters signature for primitives

Author: andriydruk

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

@@ -62,7 +62,10 @@ public void generateCode(SwiftWriter swiftWriter, String javaFullName, String sw
 
         String retType = "";
         if (returnSwiftType != null) {
-            retType = " -> " + returnSwiftType.javaSigType(isReturnTypeOptional) + "?";
+            retType = " -> " + returnSwiftType.javaSigType(isReturnTypeOptional);
+            if (isReturnTypeOptional || !returnSwiftType.isPrimitiveType()) {
+                retType += "?";
+            }
         }
 
         swiftWriter.emit(String.format(")%s {\n", retType));
@@ -75,7 +78,12 @@ public void generateCode(SwiftWriter swiftWriter, String javaFullName, String sw
             swiftWriter.emitStatement("}");
             swiftWriter.emitStatement("catch {");
             Utils.handleRuntimeError(swiftWriter);
-            swiftWriter.emitStatement(String.format("return%s", returnSwiftType != null ? " nil" : ""));
+            if (!isReturnTypeOptional && returnSwiftType.isPrimitiveType()) {
+                swiftWriter.emitStatement("return " + returnSwiftType.primitiveDefaultValue());
+            }
+            else {
+                swiftWriter.emitStatement("return nil");
+            }
             swiftWriter.emitStatement("}");
         }
 
@@ -96,7 +104,12 @@ public void generateCode(SwiftWriter swiftWriter, String javaFullName, String sw
             swiftWriter.emitStatement("}");
             swiftWriter.emitStatement("catch {");
             Utils.handleRuntimeError(swiftWriter);
-            swiftWriter.emitStatement("return nil");
+            if (!isReturnTypeOptional && returnSwiftType.isPrimitiveType()) {
+                swiftWriter.emitStatement("return " + returnSwiftType.primitiveDefaultValue());
+            }
+            else {
+                swiftWriter.emitStatement("return nil");
+            }
             swiftWriter.emitStatement("}");
         }