jsonrpc: code cleanup

Author: jknack

modules/jooby-jsonrpc/src/main/java/io/jooby/internal/jsonrpc/JsonRpcExceptionTranslator.java

@@ -12,6 +12,7 @@
 import org.slf4j.Logger;
 
 import io.jooby.Context;
+import io.jooby.Reified;
 import io.jooby.SneakyThrows;
 import io.jooby.jsonrpc.*;
 
@@ -32,26 +33,19 @@
 public class JsonRpcExecutor implements JsonRpcChain {
   private final Map<String, JsonRpcService> services;
   private final Map<Class<?>, Logger> loggers;
-  private final JsonRpcExceptionTranslator exceptionTranslator;
   private final Exception parseError;
 
   /**
    * Constructs a new executor for a single JSON-RPC request.
    *
-   * @param loggers A map of loggers keyed by service class.
    * @param services A map of registered JSON-RPC services keyed by method name.
-   * @param exceptionTranslator The translator used to map standard Throwables to JSON-RPC error
-   *     codes.
+   * @param loggers A map of service loggers keyed by service class.
    * @param parseError Any exception that occurred during the initial JSON parsing phase.
    */
   public JsonRpcExecutor(
-      Map<Class<?>, Logger> loggers,
-      Map<String, JsonRpcService> services,
-      JsonRpcExceptionTranslator exceptionTranslator,
-      Exception parseError) {
+      Map<String, JsonRpcService> services, Map<Class<?>, Logger> loggers, Exception parseError) {
     this.services = services;
     this.loggers = loggers;
-    this.exceptionTranslator = exceptionTranslator;
     this.parseError = parseError;
   }
 
@@ -93,13 +87,13 @@ public JsonRpcExecutor(
       throw new JsonRpcException(
           JsonRpcErrorCode.METHOD_NOT_FOUND, "Method not found: " + fullMethod);
     } catch (Throwable cause) {
-      return toRpcResponse(log, request, cause);
+      return toRpcResponse(ctx, log, request, cause);
     }
   }
 
   private Optional<JsonRpcResponse> toRpcResponse(
-      Logger log, JsonRpcRequest request, Throwable ex) {
-    var code = exceptionTranslator.toErrorCode(ex);
+      Context ctx, Logger log, JsonRpcRequest request, Throwable ex) {
+    var code = toErrorCode(ctx, ex);
     log(log, request, code, ex);
 
     if (SneakyThrows.isFatal(ex)) {
@@ -172,4 +166,18 @@ private void log(Logger log, JsonRpcRequest request, JsonRpcErrorCode code, Thro
       }
     }
   }
+
+  public JsonRpcErrorCode toErrorCode(Context ctx, Throwable cause) {
+    if (cause instanceof JsonRpcException rpcException) {
+      return rpcException.getCode();
+    }
+    // Attempt to look up any user-defined exception mappings from the registry
+    Map<Class<?>, JsonRpcErrorCode> customErrorMapping =
+        ctx.require(Reified.map(Class.class, JsonRpcErrorCode.class));
+    return customErrorMapping.entrySet().stream()
+        .filter(entry -> entry.getKey().isInstance(cause))
+        .findFirst()
+        .map(Map.Entry::getValue)
+        .orElseGet(() -> JsonRpcErrorCode.of(ctx.getRouter().errorCode(cause)));
+  }
 }

modules/jooby-jsonrpc/src/main/java/io/jooby/internal/jsonrpc/JsonRpcExecutor.java

@@ -24,18 +24,11 @@
 
 public class JsonRpcHandler implements Route.Handler {
   private final Map<String, JsonRpcService> services;
-  private final JsonRpcExceptionTranslator exceptionTranslator;
-  private final HashMap<Class<?>, Logger> loggers;
   private final JsonRpcInvoker invoker;
+  private final Map<Class<?>, Logger> loggers = new HashMap<>();
 
-  public JsonRpcHandler(
-      Map<String, JsonRpcService> services,
-      JsonRpcExceptionTranslator exceptionTranslator,
-      JsonRpcInvoker invoker) {
+  public JsonRpcHandler(Map<String, JsonRpcService> services, JsonRpcInvoker invoker) {
     this.services = services;
-    this.exceptionTranslator = exceptionTranslator;
-    this.invoker = invoker;
-    this.loggers = new HashMap<>();
     loggers.put(JsonRpcService.class, LoggerFactory.getLogger(JsonRpcService.class));
     services
         .values()
@@ -44,6 +37,7 @@ public JsonRpcHandler(
               var generated = service.getClass().getAnnotation(Generated.class);
               loggers.put(service.getClass(), LoggerFactory.getLogger(generated.value()));
             });
+    this.invoker = invoker;
   }
 
   /**
@@ -70,7 +64,7 @@ public JsonRpcHandler(
     }
 
     var responses = new ArrayList<JsonRpcResponse>();
-    var executor = new JsonRpcExecutor(loggers, services, exceptionTranslator, parseError);
+    var executor = new JsonRpcExecutor(services, loggers, parseError);
 
     // Look up all generated *Rpc classes registered in the service registry
     for (var request : input) {

modules/jooby-jsonrpc/src/main/java/io/jooby/internal/jsonrpc/JsonRpcHandler.java

@@ -12,7 +12,6 @@
 import io.jooby.*;
 import io.jooby.exception.MissingValueException;
 import io.jooby.exception.TypeMismatchException;
-import io.jooby.internal.jsonrpc.JsonRpcExceptionTranslator;
 import io.jooby.internal.jsonrpc.JsonRpcHandler;
 import io.jooby.jsonrpc.instrumentation.OtelJsonRcpTracing;
 
@@ -130,7 +129,7 @@ public void install(Jooby app) throws Exception {
     if (head != null) {
       invoker = invoker == null ? head : head.then(invoker);
     }
-    app.post(path, new JsonRpcHandler(services, new JsonRpcExceptionTranslator(app), invoker));
+    app.post(path, new JsonRpcHandler(services, invoker));
 
     // Initialize the custom exception mapping registry
     app.getServices()