Merge upstream changes from develop to feature

Related: SDCISA-15633, SDCISA-15833, SDCISA-16147, swisspost/vertx-redisques#170, swisspost/vertx-redisques#177, swisspost/vertx-rest-storage#186, swisspost#577, swisspost/vertx-redisques#181, swisspost#493, swisspost/vertx-rest-storage#188, swisspost#583
hiddenalpha · Jun 4, 2024 · acbcdac · acbcdac
2 parents cc94fb3 + 183cfb4
commit acbcdac
Show file tree

Hide file tree

Showing 33 changed files with 81 additions and 31 deletions.
diff --git a/gateleen-cache/pom.xml b/gateleen-cache/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-cache</artifactId>

diff --git a/gateleen-core/pom.xml b/gateleen-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-core</artifactId>

diff --git a/...en-core/src/main/java/org/swisspush/gateleen/core/exception/GateleenExceptionFactory.java b/...en-core/src/main/java/org/swisspush/gateleen/core/exception/GateleenExceptionFactory.java
@@ -36,6 +36,14 @@ public interface GateleenExceptionFactory {
 
     public Exception newException(String msg, Throwable cause);
 
+    /** Convenience overload for {@link #newIllegalStateException(String, Throwable)}. */
+    public default IllegalStateException newIllegalStateException(String msg) { return newIllegalStateException(msg, null); }
+
+    /** Convenience overload for {@link #newIllegalStateException(String, Throwable)}. */
+    public default IllegalStateException newIllegalStateException(Throwable cause) { return newIllegalStateException(null, cause); }
+
+    public IllegalStateException newIllegalStateException(String msg, Throwable cause);
+
     public ReplyException newReplyException(ReplyFailure failureType, int failureCode, String message);
 
 

diff --git a/.../src/main/java/org/swisspush/gateleen/core/exception/GateleenThriftyExceptionFactory.java b/.../src/main/java/org/swisspush/gateleen/core/exception/GateleenThriftyExceptionFactory.java
@@ -16,6 +16,12 @@ public Exception newException(String message, Throwable cause) {
         return new GateleenNoStacktraceException(message, cause);
     }
 
+    @Override
+    public IllegalStateException newIllegalStateException(String msg, Throwable cause) {
+        if (cause instanceof IllegalStateException) return (IllegalStateException) cause;
+        return new NoStackIllegalStateException(msg);
+    }
+
     @Override
     public ReplyException newReplyException(ReplyFailure failureType, int failureCode, String message) {
         return new GateleenNoStackReplyException(failureType, failureCode, message);

diff --git a/...src/main/java/org/swisspush/gateleen/core/exception/GateleenWastefulExceptionFactory.java b/...src/main/java/org/swisspush/gateleen/core/exception/GateleenWastefulExceptionFactory.java
@@ -15,6 +15,11 @@ public Exception newException(String message, Throwable cause) {
         return new Exception(message, cause);
     }
 
+    @Override
+    public IllegalStateException newIllegalStateException(String msg, Throwable cause) {
+        return new IllegalStateException(msg, cause);
+    }
+
     @Override
     public ReplyException newReplyException(ReplyFailure failureType, int failureCode, String message) {
         return new ReplyException(failureType, failureCode, message);

diff --git a/...ore/src/main/java/org/swisspush/gateleen/core/exception/NoStackIllegalStateException.java b/...ore/src/main/java/org/swisspush/gateleen/core/exception/NoStackIllegalStateException.java
@@ -0,0 +1,26 @@
+package org.swisspush.gateleen.core.exception;
+
+public class NoStackIllegalStateException extends IllegalStateException {
+
+    public NoStackIllegalStateException() {
+        super();
+    }
+
+    public NoStackIllegalStateException(String s) {
+        super(s);
+    }
+
+    public NoStackIllegalStateException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public NoStackIllegalStateException(Throwable cause) {
+        super(cause);
+    }
+
+    @Override
+    public Throwable fillInStackTrace() {
+        return this;
+    }
+
+}
diff --git a/gateleen-core/src/main/java/org/swisspush/gateleen/core/http/LocalHttpClient.java b/gateleen-core/src/main/java/org/swisspush/gateleen/core/http/LocalHttpClient.java
@@ -28,6 +28,6 @@ public void setRoutingContexttHandler(Handler<RoutingContext> wrappedRoutingCont
 
     @Override
     protected HttpClientRequest doRequest(HttpMethod method, String uri) {
-        return new LocalHttpClientRequest(method, uri, vertx, wrappedRoutingContexttHandler, exceptionFactory, new LocalHttpServerResponse(vertx));
+        return new LocalHttpClientRequest(method, uri, vertx, wrappedRoutingContexttHandler, exceptionFactory, new LocalHttpServerResponse(vertx, exceptionFactory));
     }
 }
diff --git a/gateleen-core/src/main/java/org/swisspush/gateleen/core/http/LocalHttpServerResponse.java b/gateleen-core/src/main/java/org/swisspush/gateleen/core/http/LocalHttpServerResponse.java
@@ -6,6 +6,7 @@
 import io.vertx.core.http.impl.headers.HeadersMultiMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.swisspush.gateleen.core.exception.GateleenExceptionFactory;
 import org.swisspush.gateleen.core.util.StatusCode;
 
 /**
@@ -16,6 +17,7 @@
 public class LocalHttpServerResponse extends BufferBridge implements FastFailHttpServerResponse {
 
     private static final Logger logger = LoggerFactory.getLogger(LocalHttpServerResponse.class);
+    private final GateleenExceptionFactory exceptionFactory;
     private int statusCode;
     private String statusMessage;
     private static final String EMPTY = "";
@@ -118,8 +120,9 @@ public HttpClientResponse exceptionHandler(Handler<Throwable> handler) {
     };
 
 
-    public LocalHttpServerResponse(Vertx vertx) {
+    public LocalHttpServerResponse(Vertx vertx, GateleenExceptionFactory exceptionFactory) {
         super(vertx);
+        this.exceptionFactory = exceptionFactory;
         // Attach most simple possible exception handler to base.
         setExceptionHandler(thr -> logger.error("Processing of response failed.", thr));
     }
@@ -214,9 +217,10 @@ public Future<Void> write(String chunk, String enc) {
     public Future<Void> write(Buffer data) {
         // emulate Vertx's HttpServerResponseImpl
         if (!chunked && !headers.contains(HttpHeaders.CONTENT_LENGTH)) {
-            IllegalStateException ex = new IllegalStateException("You must set the Content-Length header to be the total size of the message "
+            IllegalStateException ex = exceptionFactory.newIllegalStateException(""
+                    + "You must set the Content-Length header to be the total size of the message "
                     + "body BEFORE sending any data if you are not using HTTP chunked encoding.");
-            logger.error("non-proper HttpServerResponse occured", ex);
+            logger.debug("non-proper HttpServerResponse occurred", ex);
             throw ex;
         }
         ensureBound();

diff --git a/gateleen-delegate/pom.xml b/gateleen-delegate/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-delegate</artifactId>

diff --git a/gateleen-delta/pom.xml b/gateleen-delta/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-delta</artifactId>

diff --git a/gateleen-expansion/pom.xml b/gateleen-expansion/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-expansion</artifactId>

diff --git a/gateleen-hook-js/pom.xml b/gateleen-hook-js/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
     <artifactId>gateleen-hook-js</artifactId>
     <packaging>jar</packaging>

diff --git a/gateleen-hook/pom.xml b/gateleen-hook/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-hook</artifactId>

diff --git a/gateleen-kafka/pom.xml b/gateleen-kafka/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-kafka</artifactId>

diff --git a/gateleen-logging/pom.xml b/gateleen-logging/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-logging</artifactId>

diff --git a/gateleen-logging/src/main/java/org/swisspush/gateleen/logging/RequestPropertyFilter.java b/gateleen-logging/src/main/java/org/swisspush/gateleen/logging/RequestPropertyFilter.java
@@ -81,14 +81,15 @@ private static void logFilterResult(HttpServerRequest request, String filterProp
     private static void logFilterResult(HttpServerRequest request, String filterPropertyKey, String filterPropertyValue, FilterResult filterResult, boolean noMatchingProperty){
         if(FilterResult.NO_MATCH != filterResult) {
             Logger log = RequestLoggerFactory.getLogger(RequestPropertyFilter.class, request);
+            if (!log.isInfoEnabled()) return;
             StringBuilder sb = new StringBuilder("Request to ").append(request.uri());
             if (noMatchingProperty) {
                 sb.append(" with no matching filterProperty");
             } else {
                 sb.append(" with filterProperty ").append(filterPropertyKey).append("=").append(filterPropertyValue);
             }
             sb.append(" has FilterResult ").append(filterResult.name());
-            log.info(sb.toString());
+            log.info("{}", sb);
         }
     }
 }
diff --git a/gateleen-merge/pom.xml b/gateleen-merge/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-merge</artifactId>

diff --git a/gateleen-monitoring/pom.xml b/gateleen-monitoring/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-monitoring</artifactId>

diff --git a/gateleen-packing/pom.xml b/gateleen-packing/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-packing</artifactId>

diff --git a/gateleen-player/pom.xml b/gateleen-player/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-player</artifactId>

diff --git a/gateleen-playground/pom.xml b/gateleen-playground/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-playground</artifactId>

diff --git a/gateleen-qos/pom.xml b/gateleen-qos/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-qos</artifactId>

diff --git a/gateleen-queue/pom.xml b/gateleen-queue/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-queue</artifactId>

diff --git a/gateleen-queue/src/test/java/org/swisspush/gateleen/queue/queuing/QueueProcessorTest.java b/gateleen-queue/src/test/java/org/swisspush/gateleen/queue/queuing/QueueProcessorTest.java
@@ -217,7 +217,7 @@ private void setHttpClientRespondStatusCode(StatusCode statusCode) {
             String url = (String) invocation.getArguments()[1];
             LocalHttpClientRequest request = new LocalHttpClientRequest(httpMethod, url, vertx, event -> {
 
-            }, exceptionFactory, new LocalHttpServerResponse(vertx)) {
+            }, exceptionFactory, new LocalHttpServerResponse(vertx, exceptionFactory)) {
                 @Override
                 public HttpClientRequest response(Handler<AsyncResult<HttpClientResponse>> handler) {
                     FastFaiHttpClientResponse response = new FastFaiHttpClientResponse() {

diff --git a/gateleen-routing/pom.xml b/gateleen-routing/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-routing</artifactId>

diff --git a/gateleen-runconfig/pom.xml b/gateleen-runconfig/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-runconfig</artifactId>

diff --git a/gateleen-scheduler/pom.xml b/gateleen-scheduler/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-scheduler</artifactId>

diff --git a/gateleen-security/pom.xml b/gateleen-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-security</artifactId>

diff --git a/gateleen-test/pom.xml b/gateleen-test/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
     <artifactId>gateleen-test</artifactId>
     <packaging>jar</packaging>

diff --git a/gateleen-testhelper/pom.xml b/gateleen-testhelper/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-testhelper</artifactId>

diff --git a/gateleen-user/pom.xml b/gateleen-user/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-user</artifactId>

diff --git a/gateleen-validation/pom.xml b/gateleen-validation/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>2.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-validation</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.swisspush.gateleen</groupId>
     <artifactId>gateleen</artifactId>
-    <version>2.1.7-SNAPSHOT</version>
+    <version>2.1.8-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>gateleen</name>
     <description>Middleware library based on Vert.x to build advanced JSON/REST communication servers</description>