- normalize decoder usage of jsonRPC all fire the same error

Author: jknack

modules/jooby-avaje-jsonb/src/main/java/io/jooby/internal/avaje/jsonb/AvajeJsonRpcDecoder.java

@@ -5,37 +5,37 @@
  */
 package io.jooby.internal.avaje.jsonb;
 
+import java.lang.reflect.Type;
+
 import io.avaje.jsonb.JsonType;
 import io.avaje.jsonb.Jsonb;
+import io.jooby.exception.MissingValueException;
+import io.jooby.exception.TypeMismatchException;
 import io.jooby.jsonrpc.JsonRpcDecoder;
-import io.jooby.jsonrpc.JsonRpcErrorCode;
-import io.jooby.jsonrpc.JsonRpcException;
 
 public class AvajeJsonRpcDecoder<T> implements JsonRpcDecoder<T> {
 
   private final Jsonb jsonb;
+  private final Type type;
   private final JsonType<T> typeAdapter;
 
-  public AvajeJsonRpcDecoder(Jsonb jsonb, JsonType<T> typeAdapter) {
+  public AvajeJsonRpcDecoder(Jsonb jsonb, Type type) {
     this.jsonb = jsonb;
-    this.typeAdapter = typeAdapter;
+    this.type = type;
+    this.typeAdapter = jsonb.type(type);
   }
 
   @Override
   public T decode(String name, Object node) {
     try {
       if (node == null) {
-        return null;
+        throw new MissingValueException(name);
       }
       // Convert the Map/List/primitive back to JSON, then to the target type
       // This leverages Avaje's exact mappings without needing a tree traversal model
-      String json = jsonb.toJson(node);
-      return typeAdapter.fromJson(json);
+      return typeAdapter.fromJson(jsonb.toJson(node));
     } catch (Exception x) {
-      throw new JsonRpcException(
-          JsonRpcErrorCode.INVALID_PARAMS,
-          "Invalid params: unable to map parameter '" + name + "'",
-          x);
+      throw new TypeMismatchException(name, type, x);
     }
   }
 }

modules/jooby-avaje-jsonb/src/main/java/io/jooby/internal/avaje/jsonb/AvajeJsonRpcParser.java

@@ -22,7 +22,7 @@ public AvajeJsonRpcParser(Jsonb jsonb) {
 
   @Override
   public <T> JsonRpcDecoder<T> decoder(Type type) {
-    return new AvajeJsonRpcDecoder<>(jsonb, jsonb.type(type));
+    return new AvajeJsonRpcDecoder<>(jsonb, type);
   }
 
   @Override

modules/jooby-avaje-jsonb/src/main/java/io/jooby/internal/avaje/jsonb/AvajeJsonRpcReader.java

@@ -99,12 +99,10 @@ public String nextString(String name) {
 
   @Override
   public <T> T nextObject(String name, JsonRpcDecoder<T> decoder) {
-    Object val = require(name);
+    var val = require(name);
     return decoder.decode(name, val);
   }
 
   @Override
-  public void close() {
-    // Nothing to close for in-memory collections
-  }
+  public void close() {}
 }

modules/jooby-jackson/src/main/java/io/jooby/internal/jackson/JacksonJsonRpcDecoder.java

@@ -10,9 +10,9 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.jooby.exception.MissingValueException;
+import io.jooby.exception.TypeMismatchException;
 import io.jooby.jsonrpc.JsonRpcDecoder;
-import io.jooby.jsonrpc.JsonRpcErrorCode;
-import io.jooby.jsonrpc.JsonRpcException;
 
 public class JacksonJsonRpcDecoder<T> implements JsonRpcDecoder<T> {
 
@@ -27,15 +27,12 @@ public JacksonJsonRpcDecoder(ObjectMapper mapper, Type type) {
   @Override
   public T decode(String name, Object node) {
     try {
-      if (node == null || ((JsonNode) node).isNull()) {
-        return null;
+      if (node == null || ((JsonNode) node).isNull() || ((JsonNode) node).isMissingNode()) {
+        throw new MissingValueException(name);
       }
       return mapper.treeToValue((JsonNode) node, javaType);
     } catch (Exception x) {
-      throw new JsonRpcException(
-          JsonRpcErrorCode.INVALID_PARAMS,
-          "Invalid params: unable to map parameter '" + name + "'",
-          x);
+      throw new TypeMismatchException(name, javaType, x);
     }
   }
 }

modules/jooby-jackson/src/main/java/io/jooby/internal/jackson/JacksonJsonRpcReader.java

@@ -107,12 +107,10 @@ public String nextString(String name) {
 
   @Override
   public <T> T nextObject(String name, JsonRpcDecoder<T> decoder) {
-    JsonNode node = requireNode(name);
+    var node = requireNode(name);
     return decoder.decode(name, node);
   }
 
   @Override
-  public void close() {
-    // No network resources to release for an in-memory JsonNode tree
-  }
+  public void close() {}
 }

modules/jooby-jackson3/src/main/java/io/jooby/internal/jackson3/JacksonJsonRpcDecoder.java

@@ -7,9 +7,9 @@
 
 import java.lang.reflect.Type;
 
+import io.jooby.exception.MissingValueException;
+import io.jooby.exception.TypeMismatchException;
 import io.jooby.jsonrpc.JsonRpcDecoder;
-import io.jooby.jsonrpc.JsonRpcErrorCode;
-import io.jooby.jsonrpc.JsonRpcException;
 import tools.jackson.databind.JavaType;
 import tools.jackson.databind.JsonNode;
 import tools.jackson.databind.ObjectMapper;
@@ -27,15 +27,12 @@ public JacksonJsonRpcDecoder(ObjectMapper mapper, Type type) {
   @Override
   public T decode(String name, Object node) {
     try {
-      if (node == null || ((JsonNode) node).isNull()) {
-        return null;
+      if (node == null || ((JsonNode) node).isNull() || ((JsonNode) node).isMissingNode()) {
+        throw new MissingValueException(name);
       }
       return mapper.treeToValue((JsonNode) node, javaType);
     } catch (Exception x) {
-      throw new JsonRpcException(
-          JsonRpcErrorCode.INVALID_PARAMS,
-          "Invalid params: unable to map parameter '" + name + "'",
-          x);
+      throw new TypeMismatchException(name, javaType, x);
     }
   }
 }

modules/jooby-jackson3/src/main/java/io/jooby/internal/jackson3/JacksonJsonRpcReader.java

@@ -107,12 +107,10 @@ public String nextString(String name) {
 
   @Override
   public <T> T nextObject(String name, JsonRpcDecoder<T> decoder) {
-    JsonNode node = requireNode(name);
+    var node = requireNode(name);
     return decoder.decode(name, node);
   }
 
   @Override
-  public void close() {
-    // No network resources to release for an in-memory JsonNode tree
-  }
+  public void close() {}
 }