fix jex error controller generation (#518)

avaje · Nov 27, 2024 · 46956db · 46956db
1 parent dbf374f
commit 46956db
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 9 deletions.
diff --git a/http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerMethodWriter.java b/http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerMethodWriter.java
@@ -42,10 +42,14 @@ void writeRouting() {
     final PathSegments segments = method.pathSegments();
     final String fullPath = segments.fullPath();
 
-    if (isFilter) {
+    if (method.isErrorMethod()) {
+      writer.append("    routing.error(%s.class, this::_%s)", method.exceptionShortName(), method.simpleName());
+    } else if (isFilter) {
       writer.append("    routing.filter(this::_%s)", method.simpleName());
     } else {
-      writer.append("    routing.%s(\"%s\", this::_%s)", webMethod.name().toLowerCase(), fullPath, method.simpleName());
+      writer.append(
+          "    routing.%s(\"%s\", this::_%s)",
+          webMethod.name().toLowerCase(), fullPath, method.simpleName());
     }
 
     List<String> roles = method.roles();
@@ -65,14 +69,14 @@ void writeRouting() {
   void writeHandler(boolean requestScoped) {
 
     if (method.isErrorMethod()) {
-      writer.append("  private void _%s(Context ctx, %s ex)", method.simpleName(), method.exceptionShortName());
+      writer.append("  private void _%s(Context ctx, %s ex) {", method.simpleName(), method.exceptionShortName());
     } else if (isFilter) {
-      writer.append("  private void _%s(Context ctx, FilterChain chain)", method.simpleName());
+      writer.append("  private void _%s(Context ctx, FilterChain chain) throws IOException {", method.simpleName());
     } else {
-      writer.append("  private void _%s(Context ctx)", method.simpleName());
+      writer.append("  private void _%s(Context ctx) throws IOException {", method.simpleName());
     }
 
-    writer.append(" throws IOException {", method.simpleName()).eol();
+    writer.eol();
 
     write(requestScoped);
     writer.append("  }").eol().eol();

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -15,7 +15,7 @@
     <junit.version>5.11.3</junit.version>
     <assertj.version>3.26.3</assertj.version>
     <jackson.version>2.18.1</jackson.version>
-    <jex.version>3.0-RC1</jex.version>
+    <jex.version>3.0-RC2</jex.version>
     <avaje-inject.version>11.0</avaje-inject.version>
     <nima.version>4.1.4</nima.version>
     <javalin.version>6.3.0</javalin.version>

diff --git a/tests/test-jex/src/main/java/org/example/Main.java b/tests/test-jex/src/main/java/org/example/Main.java
@@ -23,7 +23,7 @@ public static Jex.Server start(int port, BeanScope context) {
     final Jex jex = Jex.create();
     jex.routing().addAll(context.list(Routing.HttpService.class));
 
-    jex.routing().error(ValidationException.class, (exception, ctx) -> {
+    jex.routing().error(ValidationException.class, (ctx, exception) -> {
       Map<String, Object> map = new LinkedHashMap<>();
       map.put("message", exception.getMessage());
       map.put("errors", exception.getErrors());

diff --git a/tests/test-jex/src/main/java/org/example/web/TestController.java b/tests/test-jex/src/main/java/org/example/web/TestController.java
@@ -6,12 +6,13 @@
 import io.avaje.http.api.BodyString;
 import io.avaje.http.api.Controller;
 import io.avaje.http.api.Default;
+import io.avaje.http.api.ExceptionHandler;
 import io.avaje.http.api.Filter;
 import io.avaje.http.api.Get;
-import io.avaje.http.api.InstrumentServerContext;
 import io.avaje.http.api.Options;
 import io.avaje.http.api.Path;
 import io.avaje.http.api.Post;
+import io.avaje.http.api.Produces;
 import io.avaje.http.api.QueryParam;
 import io.avaje.jex.Context;
 import io.avaje.jex.FilterChain;
@@ -50,4 +51,21 @@ void filter(FilterChain chain) throws IOException {
     System.err.println("do nothing lmao");
     chain.proceed();
   }
+
+  @ExceptionHandler
+  String exception(IllegalArgumentException ex) {
+    return "Err: " + ex;
+  }
+
+  @Produces(statusCode = 501)
+  @ExceptionHandler
+  HelloDto exceptionCtx(Exception ex, Context ctx) {
+    return null;
+  }
+
+  @ExceptionHandler(IllegalStateException.class)
+  void exceptionVoid(Context ctx) {
+    ctx.status(503);
+    ctx.text("IllegalStateException");
+  }
 }