Merge pull request #6 from hexlet-components/update

migrate to javalin 5.5
hexlet-components · May 24, 2023 · 204026f · 204026f
2 parents 16201f2 + bf9ab81
commit 204026f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 27 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,7 +3,7 @@ plugins {
   id 'checkstyle'
   id 'com.adarshr.test-logger' version '3.2.0'
   id 'com.github.ben-manes.versions' version '0.42.0'
-  id 'io.ebean' version '12.15.1'
+  id 'io.ebean' version '13.17.4'
   id 'jacoco'
 }
 
@@ -24,33 +24,34 @@ application {
 }
 
 dependencies {
-  implementation 'io.javalin:javalin:4.3.0'
-  implementation 'org.slf4j:slf4j-simple:1.7.36'
+  implementation 'io.javalin:javalin:5.5.0'
+  implementation 'io.javalin:javalin-rendering:5.5.0'
+  implementation 'org.slf4j:slf4j-simple:2.0.5'
 
-  implementation 'org.thymeleaf:thymeleaf:3.0.15.RELEASE'
-  implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.1.0'
+  implementation 'org.thymeleaf:thymeleaf:3.1.1.RELEASE'
+  implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.2.0'
   implementation 'org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE'
-  implementation 'org.webjars:bootstrap:5.1.3'
+  implementation 'org.webjars:bootstrap:5.2.3'
 
-  implementation 'com.h2database:h2:2.1.210'
-  implementation 'org.postgresql:postgresql:42.3.3'
+  implementation 'com.h2database:h2:2.1.214'
+  implementation 'org.postgresql:postgresql:42.5.4'
 
-  implementation 'io.ebean:ebean:12.15.1'
-  implementation 'io.ebean:ebean-ddl-generator:12.15.1'
+  implementation 'io.ebean:ebean:13.15.0'
+  implementation 'io.ebean:ebean-ddl-generator:13.15.0'
   implementation 'io.ebean:ebean-querybean:12.15.1'
-  implementation 'io.ebean:ebean-migration:12.15.1'
-  implementation 'io.ebean:ebean-annotation:7.7'
-  annotationProcessor 'io.ebean:querybean-generator:12.15.1'
+  implementation 'io.ebean:ebean-migration:13.7.0'
+  implementation 'io.ebean:ebean-annotation:8.3'
+  annotationProcessor 'io.ebean:querybean-generator:13.15.0'
 
   // NOTE: ebean-ddl-generator требует старые зависимости, которых нет в java 9 и выше
   implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.5'
   implementation 'javax.activation:activation:1.1.1'
 
-  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
-  testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
-  testImplementation 'org.assertj:assertj-core:3.22.0'
-  testImplementation 'io.ebean:ebean-test:12.15.1'
-  testImplementation 'com.konghq:unirest-java:3.13.6'
+  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
+  testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.2'
+  testImplementation 'org.assertj:assertj-core:3.24.0'
+  testImplementation 'io.ebean:ebean-test:13.15.0'
+  testImplementation 'com.konghq:unirest-java:3.14.2'
 }
 
 test {

diff --git a/app/src/main/java/io/hexlet/blog/App.java b/app/src/main/java/io/hexlet/blog/App.java
@@ -1,7 +1,7 @@
 package io.hexlet.blog;
 
 import io.javalin.Javalin;
-import io.javalin.plugin.rendering.template.JavalinThymeleaf;
+import io.javalin.rendering.template.JavalinThymeleaf;
 import static io.javalin.apibuilder.ApiBuilder.path;
 import static io.javalin.apibuilder.ApiBuilder.get;
 import static io.javalin.apibuilder.ApiBuilder.post;
@@ -62,10 +62,10 @@ private static void addRoutes(Javalin app) {
     public static Javalin getApp() {
         Javalin app = Javalin.create(config -> {
             if (!isProduction()) {
-                config.enableDevLogging();
+                config.plugins.enableDevLogging();
             }
-            config.enableWebjars();
-            JavalinThymeleaf.configure(getTemplateEngine());
+
+            JavalinThymeleaf.init(getTemplateEngine());
         });
 
         addRoutes(app);

diff --git a/app/src/main/resources/templates/layouts/application.html b/app/src/main/resources/templates/layouts/application.html
@@ -5,8 +5,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Javalin Blog</title>
-    <link rel='stylesheet' href='/webjars/bootstrap/5.1.3/css/bootstrap.min.css'>
-    <script src="/webjars/bootstrap/5.1.3/js/bootstrap.bundle.min.js"></script>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script>
   </head>
 
   <body class="d-flex flex-column min-vh-100">
@@ -24,7 +24,7 @@
         </div>
       </div>
     </nav>
- 
+
     <main class="flex-grow-1">
       <div
         th:if="${session.flash}"
@@ -41,7 +41,7 @@ <h1 class="my-4">
         <section layout:fragment="content"></section>
       </div>
     </main>
- 
+
     <footer class="footer border-top py-3 mt-5 bg-light">
       <div class="container-xl">
         <div class="text-center">

diff --git a/app/src/test/java/io/hexlet/blog/AppTest.java b/app/src/test/java/io/hexlet/blog/AppTest.java
@@ -110,7 +110,7 @@ void testNew() {
         void testCreate() {
             String inputName = "new name";
             String inputDescription = "new description";
-            HttpResponse<String> responsePost = Unirest
+            HttpResponse responsePost = Unirest
                 .post(baseUrl + "/articles")
                 .field("name", inputName)
                 .field("description", inputDescription)