From f43ba9ab9ccfd1de8a37a0502370795d6de38c49 Mon Sep 17 00:00:00 2001
From: Andrea Di Cesare <andrea@softinstigate.com>
Date: Wed, 22 May 2024 21:23:04 +0200
Subject: [PATCH] RESTHeart 8.0 (#7471)

* :arrow_up: Upgrade RESTHeart to v8.0.0-beta

* :arrow_up: Upgrade RESTHeart to v8.0.x

* :wrench: Update version in config.yaml

* :recycle: Exclude graalvm transitive dependencies in shaded jar using shade plugin configuration
---
 java/restheart/config.yaml                                | 2 +-
 java/restheart/etc/conf-overrides.yml                     | 6 ++++--
 java/restheart/pom.xml                                    | 8 +++++++-
 .../src/main/java/org/restheart/RootService.java          | 4 ++--
 .../src/main/java/org/restheart/UserService.java          | 5 +++--
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/java/restheart/config.yaml b/java/restheart/config.yaml
index 553552ee8e8..21010dc0a5a 100644
--- a/java/restheart/config.yaml
+++ b/java/restheart/config.yaml
@@ -1,6 +1,6 @@
 framework:
   website: restheart.org
-  version: 8.0.0-beta
+  version: 8.0
 
   build:
     - mvn package
diff --git a/java/restheart/etc/conf-overrides.yml b/java/restheart/etc/conf-overrides.yml
index 93af0f00449..25bbad2360e 100644
--- a/java/restheart/etc/conf-overrides.yml
+++ b/java/restheart/etc/conf-overrides.yml
@@ -5,9 +5,11 @@
 
 /core/name: restheart-benchmarker
 
-/fullAuthorizer/enabled: true
-
 /logging/log-level: "OFF"
 /logging/requests-log-mode: 0
 
+/fullAuthorizer/enabled: true
+
 /ping/enabled: false
+/xPoweredBy/enabled: false
+/dateHeader/enabled: false
\ No newline at end of file
diff --git a/java/restheart/pom.xml b/java/restheart/pom.xml
index 6bc74ff7b65..b1ef754779f 100644
--- a/java/restheart/pom.xml
+++ b/java/restheart/pom.xml
@@ -9,7 +9,7 @@
   <properties>
     <maven.compiler.source>21</maven.compiler.source>
     <maven.compiler.target>21</maven.compiler.target>
-    <restheart.version>8.0.0-beta</restheart.version>
+    <restheart.version>[8.0,8.1.0-SNAPSHOT)</restheart.version>
   </properties>
 
   <dependencies>
@@ -37,6 +37,12 @@
                   </excludes>
                 </filter>
               </filters>
+              <!-- avoids including graalvm transitive dependencies into shaded jar-->
+              <artifactSet>
+                <excludes>
+                    <exclude>org.graalvm.*:*</exclude>
+                </excludes>
+            </artifactSet>
             </configuration>
             <executions>
               <execution>
diff --git a/java/restheart/src/main/java/org/restheart/RootService.java b/java/restheart/src/main/java/org/restheart/RootService.java
index 5b2ed46f741..c271e5240c9 100644
--- a/java/restheart/src/main/java/org/restheart/RootService.java
+++ b/java/restheart/src/main/java/org/restheart/RootService.java
@@ -3,16 +3,16 @@
 import org.restheart.exchange.ByteArrayRequest;
 import org.restheart.exchange.ByteArrayResponse;
 import org.restheart.plugins.ByteArrayService;
+import static org.restheart.plugins.InterceptPoint.ANY;
 import org.restheart.plugins.RegisterPlugin;
 import org.restheart.plugins.RegisterPlugin.MATCH_POLICY;
-import static org.restheart.plugins.InterceptPoint.*;
 
 @RegisterPlugin(name = "benchmarkRootService",
     description = "service for root resource",
     defaultURI = "/",
     uriMatchPolicy = MATCH_POLICY.EXACT,
     blocking = false,
-    dontIntercept = { REQUEST_BEFORE_EXCHANGE_INIT, REQUEST_BEFORE_AUTH, REQUEST_AFTER_AUTH, RESPONSE, RESPONSE_ASYNC  })
+    dontIntercept = ANY)
 public class RootService implements ByteArrayService {
   @Override
   public void handle(ByteArrayRequest request, ByteArrayResponse response) throws Exception {
diff --git a/java/restheart/src/main/java/org/restheart/UserService.java b/java/restheart/src/main/java/org/restheart/UserService.java
index 0d4957f6dda..4329f159cb5 100644
--- a/java/restheart/src/main/java/org/restheart/UserService.java
+++ b/java/restheart/src/main/java/org/restheart/UserService.java
@@ -8,7 +8,7 @@
 import org.restheart.exchange.ByteArrayRequest;
 import org.restheart.exchange.ByteArrayResponse;
 import org.restheart.plugins.ByteArrayService;
-import static org.restheart.plugins.InterceptPoint.*;
+import static org.restheart.plugins.InterceptPoint.ANY;
 import org.restheart.plugins.RegisterPlugin;
 import org.restheart.utils.HttpStatus;
 
@@ -16,7 +16,7 @@
     description = "service for user resource",
     defaultURI = "/user",
     blocking = false,
-    dontIntercept = { REQUEST_BEFORE_EXCHANGE_INIT, REQUEST_BEFORE_AUTH, REQUEST_AFTER_AUTH, RESPONSE, RESPONSE_ASYNC  }
+    dontIntercept = ANY
     )
 public class UserService implements ByteArrayService {
   @Override
@@ -24,6 +24,7 @@ public void handle(ByteArrayRequest request, ByteArrayResponse response) throws
     switch(request.getMethod()) {
         case POST -> { /* nothing to do! this just sends 200 back */ }
         case GET -> response.setContent(request.getPathParam("/user/{id}", "id"));
+        case OPTIONS -> handleOptions();
         default -> response.setStatusCode(HttpStatus.SC_NOT_IMPLEMENTED);
     }
   }