Merge pull request #380 from avaje/dependabot/maven/io.javalin-javalin-6.0.0

Bump io.javalin:javalin from 5.6.3 to 6.0.0

Author: github-actions[bot]

README.md

@@ -106,12 +106,12 @@ To force the AP to generate with `@javax.inject.Singleton`(in the case where you
 
 ### Usage with Javalin
 
-The annotation processor will generate controller classes implementing the Javalin `Plugin` interface, which we can register using:
+The annotation processor will generate controller classes implementing the `AvajeJavalinPlugin` interface, which we can register in javalin using:
 
 ```java
-List<Plugin> routes = ...; //retrieve using a DI framework
+List<AvajeJavalinPlugin> routes = ...; //retrieve using a DI framework
 
-Javalin.create(cfg -> routes.forEach(cfg.plugins::register)).start();
+Javalin.create(cfg -> routes.forEach(cfg::registerPlugin)).start();
 ```
 
 ### Usage with Helidon SE (4.x)

http-api/pom.xml

@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.javalin</groupId>
       <artifactId>javalin</artifactId>
-      <version>6.0.0-beta.1</version>
+      <version>6.0.0</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

http-client/pom.xml

@@ -66,15 +66,14 @@
     <dependency>
       <groupId>io.javalin</groupId>
       <artifactId>javalin</artifactId>
-      <version>5.6.3</version>
+      <version>6.0.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
+      <version>2.1-RC3</version>
     </dependency>
 
     <dependency>

http-client/src/test/java/io/avaje/http/client/HelloControllerTest.java

@@ -287,7 +287,7 @@ void get_stream_NotFoundException() {
     assertThat(metrics.responseBytes()).isEqualTo(0);
     assertThat(metrics.totalMicros()).isGreaterThan(0);
 
-    assertThat(httpException.bodyAsString()).isEqualTo("Not Found");
+    assertThat(httpException.bodyAsString()).isEqualTo("Endpoint GET /this-path-does-not-exist not found");
     assertThat(httpException.isPlainText()).isTrue();
     assertThat(httpException.contentType())
       .isPresent()
@@ -480,7 +480,7 @@ void get_notFound() {
     final HttpResponse<String> hres = request.GET().asString();
 
     assertThat(hres.statusCode()).isEqualTo(404);
-    assertThat(hres.body()).contains("Not Found");
+    assertThat(hres.body()).contains("not found");
     final HttpClient.Metrics metrics = clientContext.metrics(true);
     assertThat(metrics.totalCount()).isEqualTo(1);
     assertThat(metrics.errorCount()).isEqualTo(1);
@@ -814,7 +814,7 @@ void get_bean_404() {
     } catch (HttpException e) {
       assertThat(e.statusCode()).isEqualTo(404);
       assertThat(e.contentType()).isPresent().get().isEqualTo("text/plain");
-      assertThat(e.bodyAsString()).isEqualTo("Not Found");
+      assertThat(e.bodyAsString()).isEqualTo("Endpoint GET /does-not-exist not found");
     }
   }
 

http-client/src/test/java/org/example/webserver/App.java

@@ -27,12 +27,7 @@ public static Javalin start(int port) {
         Javalin.create(
             config -> {
               config.showJavalinBanner = false;
-              config.accessManager(
-                  (handler, ctx, permittedRoles) -> {
-                    log.debug("allow access ...");
-                    handler.handle(ctx);
-                  });
-              config.plugins.register(bean);
+              config.registerPlugin(bean);
             });
 
     app.exception(

http-client/src/test/java/org/example/webserver/HelloController$Route.java

@@ -6,13 +6,14 @@
 
 import java.time.LocalDate;
 
+import io.avaje.http.api.AvajeJavalinPlugin;
 import io.avaje.http.api.PathSegment;
 import io.avaje.http.api.Validator;
-import io.javalin.Javalin;
-import io.javalin.plugin.Plugin;
+import io.javalin.config.JavalinConfig;
+import io.javalin.router.JavalinDefaultRouting;
 
 //@Singleton
-public class HelloController$Route implements Plugin{
+public class HelloController$Route extends AvajeJavalinPlugin {
 
   private final HelloController controller;
   private final Validator validator;
@@ -22,8 +23,13 @@ public class HelloController$Route implements Plugin{
    this.validator = validator;
   }
 
+
   @Override
-  public void apply(Javalin cfg) {
+  public void onStart(JavalinConfig cfg) {
+    cfg.router.mount(this::routes);
+  }
+
+  private void routes(JavalinDefaultRouting cfg) {
 
 	  cfg.get("/hello/message", ctx -> {
       ctx.status(200);

tests/pom.xml

@@ -18,7 +18,7 @@
     <jex.version>2.5</jex.version>
     <avaje-inject.version>9.10</avaje-inject.version>
     <nima.version>4.0.4</nima.version>
-    <javalin.version>6.0.0-beta.4</javalin.version>
+    <javalin.version>6.0.0</javalin.version>
   </properties>
 
   <modules>