Merge pull request #4 from Malcom1986/javalin6

update to javalin 6

Author: mokevnin

build.gradle.kts

@@ -3,9 +3,9 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     application
-    id("checkstyle")
-    id("io.freefair.lombok") version "8.3"
-    id("com.github.ben-manes.versions") version "0.47.0"
+    checkstyle
+    id("io.freefair.lombok") version "8.6"
+    id("com.github.ben-manes.versions") version "0.51.0"
     id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
@@ -21,18 +21,18 @@ repositories {
 }
 
 dependencies {
-    implementation("com.h2database:h2:2.2.222")
-    implementation("com.zaxxer:HikariCP:5.0.1")
-    implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
-    implementation("org.apache.commons:commons-text:1.10.0")
-    implementation("gg.jte:jte:3.1.0")
+    implementation("com.h2database:h2:2.2.224")
+    implementation("com.zaxxer:HikariCP:5.1.0")
+    implementation("com.fasterxml.jackson.core:jackson-databind:2.16.1")
+    implementation("org.apache.commons:commons-text:1.11.0")
+    implementation("gg.jte:jte:3.1.9")
     implementation("org.slf4j:slf4j-simple:2.0.9")
-    implementation("io.javalin:javalin:5.6.2")
-    implementation("io.javalin:javalin-bundle:5.6.2")
-    implementation("io.javalin:javalin-rendering:5.6.2")
+    implementation("io.javalin:javalin:6.1.3")
+    implementation("io.javalin:javalin-bundle:6.1.3")
+    implementation("io.javalin:javalin-rendering:6.1.3")
 
-    testImplementation("org.assertj:assertj-core:3.24.2")
-    testImplementation(platform("org.junit:junit-bom:5.10.0"))
+    testImplementation("org.assertj:assertj-core:3.25.3")
+    testImplementation(platform("org.junit:junit-bom:5.10.1"))
     testImplementation("org.junit.jupiter:junit-jupiter")
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

migrate-to-jdbc.md

@@ -5,18 +5,21 @@
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import io.javalin.rendering.template.JavalinJte;
+
+import static io.javalin.rendering.template.TemplateUtil.model;
+
 import org.example.hexlet.controller.CarsController;
 import org.example.hexlet.controller.PostsController;
 import org.example.hexlet.controller.SessionsController;
 import org.example.hexlet.controller.UsersController;
 import org.example.hexlet.dto.MainPage;
-import org.example.hexlet.dto.UsersPage;
 import org.example.hexlet.dto.courses.CoursesPage;
 import org.example.hexlet.dto.users.BuildUserPage;
+import org.example.hexlet.dto.users.UsersPage;
 import org.example.hexlet.model.Course;
 import org.example.hexlet.model.User;
 import org.example.hexlet.repository.BaseRepository;
@@ -63,13 +66,14 @@ public static Javalin getApp() throws IOException, SQLException {
 
         log.info(sql);
         try (var connection = dataSource.getConnection();
-                var statement = connection.createStatement()) {
+             var statement = connection.createStatement()) {
             statement.execute(sql);
         }
         BaseRepository.dataSource = dataSource;
 
         var app = Javalin.create(config -> {
-            config.plugins.enableDevLogging();
+            config.bundledPlugins.enableDevLogging();
+            config.fileRenderer(new JavalinJte());
         });
 
         app.before(ctx -> {
@@ -88,8 +92,6 @@ public static Javalin getApp() throws IOException, SQLException {
         app.patch("/posts/{id}", PostsController::update);
         app.delete("/posts", PostsController::destroy);
 
-        app.get("/users/{id}", UsersController::show);
-
         app.get("/cars", CarsController::index);
         app.get("/cars/build", CarsController::build);
         app.get("/cars/{id}", CarsController::show);
@@ -98,18 +100,16 @@ public static Javalin getApp() throws IOException, SQLException {
         app.get("/", ctx -> {
             var visited = Boolean.valueOf(ctx.cookie("visited"));
             var page = new MainPage(visited, ctx.sessionAttribute("currentUser"));
-            ctx.render("index.jte", Collections.singletonMap("page", page));
+            ctx.render("index.jte", model("page", page));
             ctx.cookie("visited", String.valueOf(true));
         });
 
         app.get(NamedRoutes.buildUserPath(), ctx -> {
             var page = new BuildUserPage();
-            ctx.render("users/build.jte", Collections.singletonMap("page", page));
+            ctx.render("users/build.jte", model("page", page));
         });
 
-        // app.get(NamedRoutes.userPath("{id}"), ctx -> {
-        //     ctx.render("users/show.jte");
-        // });
+        app.get("/users/{id}", UsersController::show);
 
         app.post(NamedRoutes.usersPath(), ctx -> {
             var name = ctx.formParam("name").trim();
@@ -126,15 +126,15 @@ public static Javalin getApp() throws IOException, SQLException {
                 ctx.redirect(NamedRoutes.usersPath());
             } catch (ValidationException e) {
                 var page = new BuildUserPage(name, email, e.getErrors());
-                ctx.render("users/build.jte", Collections.singletonMap("page", page));
+                ctx.render("users/build.jte", model("page", page));
             }
         });
 
         app.get(NamedRoutes.usersPath(), ctx -> {
-            var users = new String[] {"ivan", "peter"};
+            var users = UserRepository.getEntities();
             var page = new UsersPage(users);
             // Отдаем обратно url + query params
-            ctx.render("users/index.jte", Collections.singletonMap("page", page));
+            ctx.render("users/index.jte", model("page", page));
         });
 
         app.get(NamedRoutes.buildCoursePath(), ctx -> {
@@ -154,7 +154,7 @@ public static Javalin getApp() throws IOException, SQLException {
             var page = new CoursesPage(courses, term);
             page.setFlash(ctx.consumeSessionAttribute("flash"));
 
-            ctx.render("courses/index.jte", Collections.singletonMap("page", page));
+            ctx.render("courses/index.jte", model("page", page));
         });
 
         app.post(NamedRoutes.coursesPath(), ctx -> {

src/main/java/org/example/hexlet/HelloWorld.java

@@ -1,7 +1,6 @@
 package org.example.hexlet.controller;
 
 import java.sql.SQLException;
-import java.util.Collections;
 
 import org.example.hexlet.dto.cars.CarPage;
 import org.example.hexlet.dto.cars.CarsPage;
@@ -11,20 +10,21 @@
 
 import io.javalin.http.Context;
 import io.javalin.http.NotFoundResponse;
+import static io.javalin.rendering.template.TemplateUtil.model;
 
 public class CarsController {
     public static void index(Context ctx) throws SQLException {
         var cars = CarRepository.getEntities();
         var page = new CarsPage(cars);
-        ctx.render("cars/index.jte", Collections.singletonMap("page", page));
+        ctx.render("cars/index.jte", model("page", page));
     }
 
     public static void show(Context ctx) throws SQLException {
         var id = ctx.pathParamAsClass("id", Long.class).get();
         var car = CarRepository.find(id)
                 .orElseThrow(() -> new NotFoundResponse("Entity with id = " + id + " not found"));
         var page = new CarPage(car);
-        ctx.render("cars/show.jte", Collections.singletonMap("page", page));
+        ctx.render("cars/show.jte", model("page", page));
     }
 
     public static void build(Context ctx) {

src/main/java/org/example/hexlet/controller/CarsController.java

@@ -1,7 +1,5 @@
 package org.example.hexlet.controller;
 
-import java.util.Collections;
-
 import org.example.hexlet.dto.posts.PostPage;
 import org.example.hexlet.dto.posts.PostsPage;
 import org.example.hexlet.model.Post;
@@ -10,20 +8,21 @@
 
 import io.javalin.http.Context;
 import io.javalin.http.NotFoundResponse;
+import static io.javalin.rendering.template.TemplateUtil.model;
 
 public class PostsController {
     public static void index(Context ctx) {
         var posts = PostRepository.getEntities();
         var page = new PostsPage(posts);
-        ctx.render("posts/index.jte", Collections.singletonMap("page", page));
+        ctx.render("posts/index.jte", model("page", page));
     }
 
     public static void show(Context ctx) {
         var id = ctx.pathParamAsClass("id", Long.class).get();
         var post = PostRepository.find(id)
                 .orElseThrow(() -> new NotFoundResponse("Entity with id = " + id + " not found"));
         var page = new PostPage(post);
-        ctx.render("posts/show.jte", Collections.singletonMap("page", page));
+        ctx.render("posts/show.jte", model("page", page));
     }
 
     public static void build(Context ctx) {
@@ -44,7 +43,7 @@ public static void edit(Context ctx) {
         var post = PostRepository.find(id)
                 .orElseThrow(() -> new NotFoundResponse("Entity with id = " + id + " not found"));
         var page = new PostPage(post);
-        ctx.render("posts/edit.jte", Collections.singletonMap("page", page));
+        ctx.render("posts/edit.jte", model("page", page));
     }
 
     public static void update(Context ctx) {

src/main/java/org/example/hexlet/controller/PostsController.java

@@ -1,7 +1,5 @@
 package org.example.hexlet.controller;
 
-import java.util.Collections;
-
 import org.example.hexlet.dto.users.UserPage;
 import org.example.hexlet.dto.users.UsersPage;
 import org.example.hexlet.model.User;
@@ -10,6 +8,7 @@
 
 import io.javalin.http.Context;
 import io.javalin.http.NotFoundResponse;
+import static io.javalin.rendering.template.TemplateUtil.model;
 
 /**
  * UsersController.
@@ -18,15 +17,15 @@ public class UsersController {
     public static void index(Context ctx) {
         var users = UserRepository.getEntities();
         var page = new UsersPage(users);
-        ctx.render("users/index.jte", Collections.singletonMap("page", page));
+        ctx.render("users/index.jte", model("page", page));
     }
 
     public static void show(Context ctx) {
         var id = ctx.pathParamAsClass("id", Long.class).get();
         var user = UserRepository.find(id)
                 .orElseThrow(() -> new NotFoundResponse("Entity with id = " + id + " not found"));
         var page = new UserPage(user);
-        ctx.render("users/show.jte", Collections.singletonMap("page", page));
+        ctx.render("users/show.jte", model("page", page));
     }
 
     public static void build(Context ctx) {
@@ -48,7 +47,7 @@ public static void edit(Context ctx) {
         var user = UserRepository.find(id)
                 .orElseThrow(() -> new NotFoundResponse("Entity with id = " + id + " not found"));
         var page = new UserPage(user);
-        ctx.render("users/edit.jte", Collections.singletonMap("page", page));
+        ctx.render("users/edit.jte", model("page", page));
     }
 
     public static void update(Context ctx) {

src/main/java/org/example/hexlet/controller/UsersController.java

@@ -1,12 +1,14 @@
 @import org.example.hexlet.util.NamedRoutes
-@import org.example.hexlet.dto.UsersPage
+@import org.example.hexlet.dto.users.UsersPage;
 @param UsersPage page
 
 @template.layout.page(
     content = @`
         <a href="${NamedRoutes.buildUserPath()}">New User</a>
         @for(var user : page.getUsers())
-            <div>${user}</div>
+            <div>
+                <a href="${NamedRoutes.userPath(user.getId())}">${user.getName()}</a>
+            </div>
         @endfor
     `
 )

src/main/jte/.jteroot

@@ -0,0 +1,9 @@
+@import org.example.hexlet.dto.users.UserPage;
+@param UserPage page
+
+@template.layout.page(
+content = @`
+    <div>${page.getUser().getName()}</div>
+    <div>${page.getUser().getEmail()}</div>
+`
+)