Javalin 7 (#25)

Author: finkmanAtSap

ams-javalin-shopping/pom.xml

@@ -18,7 +18,7 @@
         <sap.cloud.security.ams.version>4.0.7</sap.cloud.security.ams.version>
         <sap.cloud.security.ams.dcl-compiler.version>1.1.1</sap.cloud.security.ams.dcl-compiler.version>
         <sap.cloud.environment.servicebinding.version>0.21.0</sap.cloud.environment.servicebinding.version>
-        <javalin.version>6.7.0</javalin.version>
+        <javalin.version>7.1.0</javalin.version>
         <jackson.version>2.21.1</jackson.version>
         <opencsv.version>5.12.0</opencsv.version>
         <slf4j.version>2.0.7</slf4j.version>

ams-javalin-shopping/src/main/java/com/sap/cloud/security/ams/samples/AppFactory.java

@@ -1,16 +1,20 @@
 package com.sap.cloud.security.ams.samples;
 
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import com.sap.cloud.security.ams.samples.auth.*;
+import com.sap.cloud.security.ams.samples.auth.AuthHandler;
+import com.sap.cloud.security.ams.samples.auth.Role;
 import com.sap.cloud.security.ams.samples.db.SimpleDatabase;
 import com.sap.cloud.security.ams.samples.model.HealthStatus;
-import com.sap.cloud.security.ams.samples.service.*;
+import com.sap.cloud.security.ams.samples.service.OrdersService;
+import com.sap.cloud.security.ams.samples.service.PrivilegesService;
+import com.sap.cloud.security.ams.samples.service.ProductsService;
+import io.javalin.Javalin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import org.slf4j.*;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.javalin.Javalin;
+import static io.javalin.apibuilder.ApiBuilder.*;
 
 /**
  * Factory class for creating and configuring the Javalin application.
@@ -23,7 +27,7 @@ public class AppFactory {
 
     /**
      * Create and configure the Javalin application
-     * 
+     *
      * @param authHandler The authentication handler to use
      * @return Configured Javalin application
      */
@@ -36,30 +40,35 @@ public static Javalin createApp(AuthHandler authHandler) {
         OrdersService ordersService = new OrdersService(database, authHandler);
         PrivilegesService privilegesService = new PrivilegesService(authHandler);
 
-        Javalin app = Javalin.create();
+        Javalin app = Javalin.create(config -> {
+            // Request lifecycle handlers
+            config.routes.beforeMatched(authHandler);
+            config.routes.after(authHandler::clear);
 
-        app.beforeMatched(authHandler::handle);
-        app.after(authHandler::clear);
-
-        app.get("/health", ctx -> {
-            if (isReady.get()) {
-                ctx.json(HealthStatus.up());
-            } else {
-                ctx.status(503).json(HealthStatus.down("Service is not ready"));
-            }
-        });
+            // Routes using apiBuilder syntax
+            config.routes.apiBuilder(() -> {
+                // Health endpoint
+                get("/health", ctx -> {
+                    if (isReady.get()) {
+                        ctx.json(HealthStatus.up());
+                    } else {
+                        ctx.status(503).json(HealthStatus.down("Service is not ready"));
+                    }
+                });
 
-        // API endpoints
-        app.get("/privileges", privilegesService.getPrivileges(), Role.AUTHENTICATED);
-        app.get("/products", productsService.getProducts(), Role.READ_PRODUCTS);
-        app.get("/orders", ordersService.getOrders(), Role.READ_ORDERS);
-        app.post("/orders", ordersService.createOrder(), Role.CREATE_ORDERS);
-        app.delete("/orders/{id}", ordersService.deleteOrder(), Role.DELETE_ORDERS);
+                // API endpoints  
+                get("/privileges", privilegesService.getPrivileges(), Role.AUTHENTICATED);
+                get("/products", productsService.getProducts(), Role.READ_PRODUCTS);
+                get("/orders", ordersService.getOrders(), Role.READ_ORDERS);
+                post("/orders", ordersService.createOrder(), Role.CREATE_ORDERS);
+                delete("/orders/{id}", ordersService.deleteOrder(), Role.DELETE_ORDERS);
+            });
 
-        // Global error handler
-        app.exception(Exception.class, (e, ctx) -> {
-            LOG.error("Unhandled exception", e);
-            ctx.status(500).result("Internal server error");
+            // Global error handler
+            config.routes.exception(Exception.class, (e, ctx) -> {
+                LOG.error("Unhandled exception", e);
+                ctx.status(500).result("Internal server error");
+            });
         });
 
         // Wait up to 30s for AMS to become ready
@@ -74,4 +83,4 @@ public static Javalin createApp(AuthHandler authHandler) {
 
         return app;
     }
-}
+}