fix java generator

Author: adbenitez

dcrpcgen/java/__init__.py

@@ -77,7 +77,9 @@ def generate_method(method: dict[str, Any]) -> str:
         decode_type(param["schema"])[0] + " " + param["name"] for param in params
     )
     text += ") throws RpcException {\n"
-    args = ", ".join([f'"{name}"'] + [param["name"] for param in params])
+    args = ", ".join(
+        [f'"{name}"'] + [f'mapper.valueToTree({param["name"]})' for param in params]
+    )
     if result_type == "void":
         text += f"    transport.call({args});\n"
     else:

dcrpcgen/java/templates/BaseTransport.java.j2

@@ -26,11 +26,15 @@ public abstract class BaseTransport implements Rpc.Transport {
   /* Get next Response as raw JSON String from the RPC server */
   protected abstract String getResponse();
 
-  public void call(String method, Object... params) throws RpcException {
+  public ObjectMapper getObjectMapper() {
+    return mapper;
+  }
+
+  public void call(String method, JsonNode... params) throws RpcException {
     innerCall(method, params);
   }
 
-  public <T> T callForResult(TypeReference<T> resultType, String method, Object... params) throws RpcException {
+  public <T> T callForResult(TypeReference<T> resultType, String method, JsonNode... params) throws RpcException {
     try {
       JsonNode node = innerCall(method, params);
       if (node.isNull()) return null;
@@ -40,7 +44,7 @@ public abstract class BaseTransport implements Rpc.Transport {
     }
   }
 
-  private JsonNode innerCall(String method, Object... params) throws RpcException {
+  private JsonNode innerCall(String method, JsonNode... params) throws RpcException {
     int id;
     synchronized (this) {
       id = ++requestId;
@@ -101,10 +105,10 @@ public abstract class BaseTransport implements Rpc.Transport {
   private static class Request {
     private final String jsonrpc = "2.0";
     public final String method;
-    public final Object[] params;
+    public final JsonNode[] params;
     public final int id;
 
-    public Request(String method, Object[] params, int id) {
+    public Request(String method, JsonNode[] params, int id) {
       this.method = method;
       this.params = params;
       this.id = id;

dcrpcgen/java/templates/Rpc.java.j2

@@ -2,20 +2,25 @@
 package {{ package }};
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import {{ package + ".types" }}.*;
 
 public class Rpc {
 
   public interface Transport {
-    public void call(String method, Object... params) throws RpcException;
-    public <T> T callForResult(TypeReference<T> resultType, String method, Object... params) throws RpcException;
+    void call(String method, JsonNode... params) throws RpcException;
+    <T> T callForResult(TypeReference<T> resultType, String method, JsonNode... params) throws RpcException;
+    ObjectMapper getObjectMapper();
   }
 
   public final Transport transport;
+  private final ObjectMapper mapper;
 
   public Rpc(Transport transport) {
     this.transport = transport;
+    this.mapper = transport.getObjectMapper();
   }
 
 {% for method in methods %}

dcrpcgen/java/templates/SuperClass.java.j2

@@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 
 {% if "description" in schema %}{{ create_comment(schema["description"]) }}{% endif -%}
-@JsonTypeInfo(use=Id.MINIMAL_CLASS, include=As.PROPERTY, property="kind")
-@JsonSubTypes({ {%- for typ in schema["oneOf"] %}{% if loop.index != 1 %}, {% endif %}@Type({{ name }}.{{ get_subtype_name(typ) }}.class){% endfor -%} })
+@JsonTypeInfo(use=Id.NAME, include=As.PROPERTY, property="kind")
+@JsonSubTypes({ {%- for typ in schema["oneOf"] %}{% if loop.index != 1 %}, {% endif %}@Type(value = {{ name }}.{{ get_subtype_name(typ) }}.class, name="{{ get_subtype_name(typ) }}"){% endfor -%} })
 public abstract class {{ name }} {
 
 {% for typ in schema["oneOf"] %}

dcrpcgen/java/utils.py

@@ -17,10 +17,7 @@ def create_comment(text: str, indentation: str = "") -> str:
 
     comment = f"{indentation}/**\n"
     for line in text.split("\n"):
-        if line.strip():
-            comment += f"{indentation} * {line}\n"
-        else:
-            comment += f"{indentation} *\n"
+        comment += f"{indentation} * {line.strip() or '<p>'}\n"
     return comment + f"{indentation} */\n"