Don't send 0 for numeric parmeters that have not been specified (or false for boolean).

guss77 · guss77 · commit 218e671174e8 · 2020-01-13T11:08:58.000+02:00
Parameters should be boxed (object type) in internal storage, so if the user did not specify the parameter,
we will not assume the value is 0 - as in ARI not specifying an optional param often has more meaning than
"zero". For example, in `POST /channels` ("channel originate"), not setting the priority means "1" and not "0".
diff --git a/codegen/src/main/java/ch/loway/oss/ari4java/codegen/DefMapper.java b/codegen/src/main/java/ch/loway/oss/ari4java/codegen/DefMapper.java
@@ -433,6 +433,8 @@ private Apis loadApis(JsonNode apis, File f, String apiVersion) throws IOExcepti
                     for (JsonNode parameter : parameters) {
                         Operation.Param p = new Operation.Param();
                         p.javaType = remapAbstractType(txt(parameter.get("dataType")));
+                        p.methodArgumentType = JavaPkgInfo.primitiveSignature.containsKey(p.javaType) ?
+                                JavaPkgInfo.primitiveSignature.get(p.javaType) : p.javaType;
                         p.name = txt(parameter.get("name"));
                         p.required = txt(parameter.get("required")).equalsIgnoreCase("true");
                         p.type = Operation.ParamType.build(txt(parameter.get("paramType")));
diff --git a/codegen/src/main/java/ch/loway/oss/ari4java/codegen/genJava/JavaPkgInfo.java b/codegen/src/main/java/ch/loway/oss/ari4java/codegen/genJava/JavaPkgInfo.java
@@ -10,21 +10,27 @@
 public class JavaPkgInfo {
 
     public final static Map<String, String> TypeMap;
+    public final static Map<String, String> primitiveSignature;
 
     static {
         TypeMap = new HashMap<String, String>();
         TypeMap.put("string", "String");
-        TypeMap.put("long", "long");
-        TypeMap.put("int", "int");
-        TypeMap.put("double", "double");
+        TypeMap.put("long", "Long");
+        TypeMap.put("int", "Integer");
+        TypeMap.put("double", "Double");
         TypeMap.put("date", "Date");
         TypeMap.put("object", "Object");
-        TypeMap.put("boolean", "boolean");
+        TypeMap.put("boolean", "Boolean");
         TypeMap.put("binary", "byte[]");
         TypeMap.put("containers", "Map<String,String>");
+        
+        primitiveSignature = new HashMap<String, String>();
+        primitiveSignature.put("Boolean", "boolean");
+        primitiveSignature.put("Integer", "int");
+        primitiveSignature.put("Long", "long");
+        primitiveSignature.put("Double", "double");
     }
 
-
     String base = "ch.loway.oss.ari4java.generated";
     public String className = "";
     public String apiVersion = "";
diff --git a/codegen/src/main/java/ch/loway/oss/ari4java/codegen/models/Operation.java b/codegen/src/main/java/ch/loway/oss/ari4java/codegen/models/Operation.java
@@ -296,6 +296,7 @@ public static class Param {
         public String name = "";
         public ParamType type = ParamType.PATH;
         public String javaType = "";
+        public String methodArgumentType = "";
         public boolean required = true;
 
         public String getSignature(String returnType) {
@@ -308,7 +309,7 @@ public String getSignature(String returnType) {
         public String getDefinition(String returnType) {
             StringBuilder sb = new StringBuilder();
             sb.append("  public ").append(returnType).append(" ").append(JavaGen.addPrefixAndCapitalize("set", name))
-                    .append("(").append(javaType).append(" ").append(name).append(")");
+                    .append("(").append(methodArgumentType).append(" ").append(name).append(")");
             return sb.toString();
         }
         
diff --git a/src/main/java/ch/loway/oss/ari4java/tools/HttpParam.java b/src/main/java/ch/loway/oss/ari4java/tools/HttpParam.java
@@ -31,15 +31,21 @@ public static List<ch.loway.oss.ari4java.tools.HttpParam> build(String key, Map<
         return vars;
     }
 
-    public static HttpParam build(String n, int v) {
+    public static HttpParam build(String n, Integer v) {
+        if (null == v)
+            return build(n, (String)null);
         return build(n, Integer.toString(v));
     }
 
-    public static HttpParam build(String n, long v) {
+    public static HttpParam build(String n, Long v) {
+        if (null == v)
+            return build(n, (String)null);
         return build(n, Long.toString(v));
     }
 
-    public static HttpParam build(String n, boolean v) {
+    public static HttpParam build(String n, Boolean v) {
+        if (null == v)
+            return build(n, (String)null);
         return build(n, v ? "true" : "false");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,21 @@ public static List<ch.loway.oss.ari4java.tools.HttpParam> build(String key, Map<`
`31`	`31`	`return vars;`
`32`	`32`	`}`
`33`	`33`
`34`		`- public static HttpParam build(String n, int v) {`
	`34`	`+ public static HttpParam build(String n, Integer v) {`
	`35`	`+ if (null == v)`
	`36`	`+ return build(n, (String)null);`
`35`	`37`	`return build(n, Integer.toString(v));`
`36`	`38`	`}`
`37`	`39`
`38`		`- public static HttpParam build(String n, long v) {`
	`40`	`+ public static HttpParam build(String n, Long v) {`
	`41`	`+ if (null == v)`
	`42`	`+ return build(n, (String)null);`
`39`	`43`	`return build(n, Long.toString(v));`
`40`	`44`	`}`
`41`	`45`
`42`		`- public static HttpParam build(String n, boolean v) {`
	`46`	`+ public static HttpParam build(String n, Boolean v) {`
	`47`	`+ if (null == v)`
	`48`	`+ return build(n, (String)null);`
`43`	`49`	`return build(n, v ? "true" : "false");`
`44`	`50`	`}`
`45`	`51`