Quarkus 3.8.4 upgrade

Hyperfoil · Apr 17, 2024 · 74088db · 74088db
1 parent 20417bf
commit 74088db
Showing 5 changed files with 25 additions and 33 deletions.
diff --git a/horreum-api/pom.xml b/horreum-api/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-client</artifactId>
+            <artifactId>quarkus-resteasy-client</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>

diff --git a/horreum-backend/pom.xml b/horreum-backend/pom.xml
@@ -24,21 +24,23 @@
             <scope>provided</scope>
             <version>${project.version}</version>
         </dependency>
-         <dependency>
-            <groupId>org.graalvm.sdk</groupId>
-            <artifactId>graal-sdk</artifactId>
+        <dependency>
+            <groupId>org.graalvm.polyglot</groupId>
+            <artifactId>polyglot</artifactId>
+            <version>${graalvm.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.graalvm.polyglot</groupId>
+            <artifactId>js-community</artifactId>
             <version>${graalvm.version}</version>
+            <type>pom</type>
         </dependency>
+        <!-- Same but for GraalVM Enterprise -->
         <dependency>
-            <groupId>org.graalvm.js</groupId>
+            <groupId>org.graalvm.polyglot</groupId>
             <artifactId>js</artifactId>
             <version>${graalvm.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.graalvm.sdk</groupId>
-                    <artifactId>graal-sdk</artifactId>
-                </exclusion>
-            </exclusions>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
@@ -69,12 +71,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.graalvm.sdk</groupId>
-                    <artifactId>graal-sdk</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
@@ -84,12 +80,6 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.graalvm.sdk</groupId>
-                    <artifactId>graal-sdk</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -141,7 +131,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-client-jackson</artifactId>
+            <artifactId>quarkus-resteasy-client-jackson</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/TestServiceImpl.java b/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/TestServiceImpl.java
@@ -204,7 +204,7 @@ public Test add(Test dto){
    TestDAO addAuthenticated(Test dto) {
       TestDAO existing = TestDAO.find("id", dto.id).firstResult();
       if(existing == null)
-         dto.id = null;
+         dto.clearIds();
       TestDAO test = TestMapper.to(dto);
       if (test.notificationsEnabled == null) {
          test.notificationsEnabled = true;
@@ -228,7 +228,7 @@ TestDAO addAuthenticated(Test dto) {
 
          test.views = existing.views;
          test.tokens = existing.tokens;
-         em.merge(test);
+         test = em.merge(test);
          if(shouldRecalculateLables)
            mediator.updateFingerprints(test.id);
       }
@@ -238,7 +238,7 @@ TestDAO addAuthenticated(Test dto) {
             test.views = Collections.singleton(new ViewDAO("Default", test));
          }
          try {
-            em.merge(test);
+            test = em.merge(test);
             em.flush();
          } catch (PersistenceException e) {
             if (e.getCause() instanceof org.hibernate.exception.ConstraintViolationException) {
@@ -248,8 +248,11 @@ TestDAO addAuthenticated(Test dto) {
             }
          }
          mediator.newTest(TestMapper.from(test));
-         if(mediator.testMode())
-            Util.registerTxSynchronization(tm, txStatus -> mediator.publishEvent(AsyncEventChannels.TEST_NEW, test.id, TestMapper.from(test)));
+         if(mediator.testMode()) {
+            int testId = test.id;
+            Test testDTO = TestMapper.from(test);
+            Util.registerTxSynchronization(tm, txStatus -> mediator.publishEvent(AsyncEventChannels.TEST_NEW, testId, testDTO));
+         }
       }
       return test;
    }

diff --git a/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/DatasourceTest.java b/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/DatasourceTest.java
@@ -255,8 +255,7 @@ private void uploadDoc(String index, String idField,  String resourcepath){
             request.setJsonEntity(payload.toString());
             Response response = elasticRestClient.performRequest(request);
             assertNotNull(response);
-            String header = response.getHeader("Location");
-            assertNotNull(header);
+            assertEquals(2, response.getStatusLine().getStatusCode() / 100); // response is 2xx
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         } catch (IOException e) {

diff --git a/pom.xml b/pom.xml
@@ -81,8 +81,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <commons.math3.version>3.6.1</commons.math3.version>
-        <graalvm.version>23.0.3</graalvm.version>
-        <quarkus.version>3.6.8</quarkus.version>
+        <graalvm.version>23.1.2</graalvm.version>
+        <quarkus.version>3.8.4</quarkus.version>
         <quinoa.version>2.3.6</quinoa.version>
         <surefire-plugin.version>3.2.5</surefire-plugin.version>
         <failsafe-plugin.version>3.2.5</failsafe-plugin.version>