From aaab9d8d7b70af5d01837d3e92ba3729c4620168 Mon Sep 17 00:00:00 2001 From: Andreas Fankhauser <23085769+hiddenalpha@users.noreply.github.com> Date: Mon, 27 May 2024 19:20:32 +0200 Subject: [PATCH 1/9] Errors should be reported ONCE only. Related: SDCISA-15833, https://github.com/swisspost/vertx-redisques/issues/170, https://github.com/swisspost/vertx-redisques/pull/177, https://github.com/swisspost/vertx-rest-storage/pull/186, #577, https://github.com/swisspost/vertx-redisques/pull/181 --- .../swisspush/gateleen/core/http/LocalHttpServerResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index d6ad0845c..75f8a6a7e 100644 --- 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 @@ -216,7 +216,7 @@ public Future write(Buffer data) { 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 " + "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 occured", ex); throw ex; } ensureBound(); From 4d89fcfd220feb58dd3e2f57e587d252cbf8d6a3 Mon Sep 17 00:00:00 2001 From: runner Date: Wed, 29 May 2024 07:13:39 +0000 Subject: [PATCH 2/9] updating poms for 2.1.7 branch with snapshot versions From 46d9a38127bc3fd550f298e25bc5f2b3bf0681a4 Mon Sep 17 00:00:00 2001 From: runner Date: Wed, 29 May 2024 07:13:41 +0000 Subject: [PATCH 3/9] updating poms for 2.1.8-SNAPSHOT development --- gateleen-cache/pom.xml | 2 +- gateleen-core/pom.xml | 2 +- gateleen-delegate/pom.xml | 2 +- gateleen-delta/pom.xml | 2 +- gateleen-expansion/pom.xml | 2 +- gateleen-hook-js/pom.xml | 2 +- gateleen-hook/pom.xml | 2 +- gateleen-kafka/pom.xml | 2 +- gateleen-logging/pom.xml | 2 +- gateleen-merge/pom.xml | 2 +- gateleen-monitoring/pom.xml | 2 +- gateleen-packing/pom.xml | 2 +- gateleen-player/pom.xml | 2 +- gateleen-playground/pom.xml | 2 +- gateleen-qos/pom.xml | 2 +- gateleen-queue/pom.xml | 2 +- gateleen-routing/pom.xml | 2 +- gateleen-runconfig/pom.xml | 2 +- gateleen-scheduler/pom.xml | 2 +- gateleen-security/pom.xml | 2 +- gateleen-test/pom.xml | 2 +- gateleen-testhelper/pom.xml | 2 +- gateleen-user/pom.xml | 2 +- gateleen-validation/pom.xml | 2 +- pom.xml | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gateleen-cache/pom.xml b/gateleen-cache/pom.xml index c45639810..ec1ab879e 100644 --- a/gateleen-cache/pom.xml +++ b/gateleen-cache/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-cache diff --git a/gateleen-core/pom.xml b/gateleen-core/pom.xml index c6124598c..7ca3e99ee 100644 --- a/gateleen-core/pom.xml +++ b/gateleen-core/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-core diff --git a/gateleen-delegate/pom.xml b/gateleen-delegate/pom.xml index 3374b2244..76f734231 100644 --- a/gateleen-delegate/pom.xml +++ b/gateleen-delegate/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-delegate diff --git a/gateleen-delta/pom.xml b/gateleen-delta/pom.xml index 1fecc47b8..707c2b705 100644 --- a/gateleen-delta/pom.xml +++ b/gateleen-delta/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-delta diff --git a/gateleen-expansion/pom.xml b/gateleen-expansion/pom.xml index cd4fa1dd5..6fd869f93 100644 --- a/gateleen-expansion/pom.xml +++ b/gateleen-expansion/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-expansion diff --git a/gateleen-hook-js/pom.xml b/gateleen-hook-js/pom.xml index 59455301d..6790dd29b 100644 --- a/gateleen-hook-js/pom.xml +++ b/gateleen-hook-js/pom.xml @@ -4,7 +4,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-hook-js jar diff --git a/gateleen-hook/pom.xml b/gateleen-hook/pom.xml index d0c5e3ca2..957613927 100644 --- a/gateleen-hook/pom.xml +++ b/gateleen-hook/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-hook diff --git a/gateleen-kafka/pom.xml b/gateleen-kafka/pom.xml index c58d33a08..ab53b09fe 100644 --- a/gateleen-kafka/pom.xml +++ b/gateleen-kafka/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-kafka diff --git a/gateleen-logging/pom.xml b/gateleen-logging/pom.xml index 8a6ba5a5f..446f61684 100644 --- a/gateleen-logging/pom.xml +++ b/gateleen-logging/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-logging diff --git a/gateleen-merge/pom.xml b/gateleen-merge/pom.xml index 1ac048c6e..a33161ac6 100644 --- a/gateleen-merge/pom.xml +++ b/gateleen-merge/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-merge diff --git a/gateleen-monitoring/pom.xml b/gateleen-monitoring/pom.xml index d5fbb3a8d..4242c1777 100644 --- a/gateleen-monitoring/pom.xml +++ b/gateleen-monitoring/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-monitoring diff --git a/gateleen-packing/pom.xml b/gateleen-packing/pom.xml index 5298ffb32..00d804238 100644 --- a/gateleen-packing/pom.xml +++ b/gateleen-packing/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-packing diff --git a/gateleen-player/pom.xml b/gateleen-player/pom.xml index de137f487..32e1414f7 100644 --- a/gateleen-player/pom.xml +++ b/gateleen-player/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-player diff --git a/gateleen-playground/pom.xml b/gateleen-playground/pom.xml index e1cf9a818..50e9ac122 100644 --- a/gateleen-playground/pom.xml +++ b/gateleen-playground/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-playground diff --git a/gateleen-qos/pom.xml b/gateleen-qos/pom.xml index 7bb5aea47..8cca1b4c2 100644 --- a/gateleen-qos/pom.xml +++ b/gateleen-qos/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-qos diff --git a/gateleen-queue/pom.xml b/gateleen-queue/pom.xml index 7cc56c55d..5f42bd0a2 100644 --- a/gateleen-queue/pom.xml +++ b/gateleen-queue/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-queue diff --git a/gateleen-routing/pom.xml b/gateleen-routing/pom.xml index 07b9b4dbe..85ab49b46 100644 --- a/gateleen-routing/pom.xml +++ b/gateleen-routing/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-routing diff --git a/gateleen-runconfig/pom.xml b/gateleen-runconfig/pom.xml index 8d4324df2..c6e4daa80 100644 --- a/gateleen-runconfig/pom.xml +++ b/gateleen-runconfig/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-runconfig diff --git a/gateleen-scheduler/pom.xml b/gateleen-scheduler/pom.xml index 1fcfbf677..25367dc43 100644 --- a/gateleen-scheduler/pom.xml +++ b/gateleen-scheduler/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-scheduler diff --git a/gateleen-security/pom.xml b/gateleen-security/pom.xml index 0fc3067c4..9173fc016 100644 --- a/gateleen-security/pom.xml +++ b/gateleen-security/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-security diff --git a/gateleen-test/pom.xml b/gateleen-test/pom.xml index 8611850de..79bc6c1a2 100644 --- a/gateleen-test/pom.xml +++ b/gateleen-test/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-test jar diff --git a/gateleen-testhelper/pom.xml b/gateleen-testhelper/pom.xml index 05882f11d..ec439ba52 100644 --- a/gateleen-testhelper/pom.xml +++ b/gateleen-testhelper/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-testhelper diff --git a/gateleen-user/pom.xml b/gateleen-user/pom.xml index 4f69e7b6d..92cc2d300 100644 --- a/gateleen-user/pom.xml +++ b/gateleen-user/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-user diff --git a/gateleen-validation/pom.xml b/gateleen-validation/pom.xml index 391d4c537..5afcddce0 100644 --- a/gateleen-validation/pom.xml +++ b/gateleen-validation/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT gateleen-validation diff --git a/pom.xml b/pom.xml index 5cecd732f..19ae1663a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.8-SNAPSHOT pom gateleen Middleware library based on Vert.x to build advanced JSON/REST communication servers From 9b86dbce691e451ab5e21570bd189e48a8f50c36 Mon Sep 17 00:00:00 2001 From: runner Date: Wed, 29 May 2024 07:13:44 +0000 Subject: [PATCH 4/9] updating poms for branch'release-2.1.7' with non-snapshot versions --- gateleen-cache/pom.xml | 2 +- gateleen-core/pom.xml | 2 +- gateleen-delegate/pom.xml | 2 +- gateleen-delta/pom.xml | 2 +- gateleen-expansion/pom.xml | 2 +- gateleen-hook-js/pom.xml | 2 +- gateleen-hook/pom.xml | 2 +- gateleen-kafka/pom.xml | 2 +- gateleen-logging/pom.xml | 2 +- gateleen-merge/pom.xml | 2 +- gateleen-monitoring/pom.xml | 2 +- gateleen-packing/pom.xml | 2 +- gateleen-player/pom.xml | 2 +- gateleen-playground/pom.xml | 2 +- gateleen-qos/pom.xml | 2 +- gateleen-queue/pom.xml | 2 +- gateleen-routing/pom.xml | 2 +- gateleen-runconfig/pom.xml | 2 +- gateleen-scheduler/pom.xml | 2 +- gateleen-security/pom.xml | 2 +- gateleen-test/pom.xml | 2 +- gateleen-testhelper/pom.xml | 2 +- gateleen-user/pom.xml | 2 +- gateleen-validation/pom.xml | 2 +- pom.xml | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gateleen-cache/pom.xml b/gateleen-cache/pom.xml index c45639810..b9488007d 100644 --- a/gateleen-cache/pom.xml +++ b/gateleen-cache/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-cache diff --git a/gateleen-core/pom.xml b/gateleen-core/pom.xml index c6124598c..5fdfe1461 100644 --- a/gateleen-core/pom.xml +++ b/gateleen-core/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-core diff --git a/gateleen-delegate/pom.xml b/gateleen-delegate/pom.xml index 3374b2244..92b70132a 100644 --- a/gateleen-delegate/pom.xml +++ b/gateleen-delegate/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-delegate diff --git a/gateleen-delta/pom.xml b/gateleen-delta/pom.xml index 1fecc47b8..2cab32748 100644 --- a/gateleen-delta/pom.xml +++ b/gateleen-delta/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-delta diff --git a/gateleen-expansion/pom.xml b/gateleen-expansion/pom.xml index cd4fa1dd5..ca0e63717 100644 --- a/gateleen-expansion/pom.xml +++ b/gateleen-expansion/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-expansion diff --git a/gateleen-hook-js/pom.xml b/gateleen-hook-js/pom.xml index 59455301d..2f553afb0 100644 --- a/gateleen-hook-js/pom.xml +++ b/gateleen-hook-js/pom.xml @@ -4,7 +4,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-hook-js jar diff --git a/gateleen-hook/pom.xml b/gateleen-hook/pom.xml index d0c5e3ca2..05f417bdb 100644 --- a/gateleen-hook/pom.xml +++ b/gateleen-hook/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-hook diff --git a/gateleen-kafka/pom.xml b/gateleen-kafka/pom.xml index c58d33a08..e5caba904 100644 --- a/gateleen-kafka/pom.xml +++ b/gateleen-kafka/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-kafka diff --git a/gateleen-logging/pom.xml b/gateleen-logging/pom.xml index 8a6ba5a5f..82187638a 100644 --- a/gateleen-logging/pom.xml +++ b/gateleen-logging/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-logging diff --git a/gateleen-merge/pom.xml b/gateleen-merge/pom.xml index 1ac048c6e..c121f9588 100644 --- a/gateleen-merge/pom.xml +++ b/gateleen-merge/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-merge diff --git a/gateleen-monitoring/pom.xml b/gateleen-monitoring/pom.xml index d5fbb3a8d..9ed1c515f 100644 --- a/gateleen-monitoring/pom.xml +++ b/gateleen-monitoring/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-monitoring diff --git a/gateleen-packing/pom.xml b/gateleen-packing/pom.xml index 5298ffb32..30fe8a174 100644 --- a/gateleen-packing/pom.xml +++ b/gateleen-packing/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-packing diff --git a/gateleen-player/pom.xml b/gateleen-player/pom.xml index de137f487..12b84c92e 100644 --- a/gateleen-player/pom.xml +++ b/gateleen-player/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-player diff --git a/gateleen-playground/pom.xml b/gateleen-playground/pom.xml index e1cf9a818..cd0b16d30 100644 --- a/gateleen-playground/pom.xml +++ b/gateleen-playground/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-playground diff --git a/gateleen-qos/pom.xml b/gateleen-qos/pom.xml index 7bb5aea47..e3554929f 100644 --- a/gateleen-qos/pom.xml +++ b/gateleen-qos/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-qos diff --git a/gateleen-queue/pom.xml b/gateleen-queue/pom.xml index 7cc56c55d..efb7e59c9 100644 --- a/gateleen-queue/pom.xml +++ b/gateleen-queue/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-queue diff --git a/gateleen-routing/pom.xml b/gateleen-routing/pom.xml index 07b9b4dbe..dec2f7157 100644 --- a/gateleen-routing/pom.xml +++ b/gateleen-routing/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-routing diff --git a/gateleen-runconfig/pom.xml b/gateleen-runconfig/pom.xml index 8d4324df2..d72ba1fca 100644 --- a/gateleen-runconfig/pom.xml +++ b/gateleen-runconfig/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-runconfig diff --git a/gateleen-scheduler/pom.xml b/gateleen-scheduler/pom.xml index 1fcfbf677..6b6cb78da 100644 --- a/gateleen-scheduler/pom.xml +++ b/gateleen-scheduler/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-scheduler diff --git a/gateleen-security/pom.xml b/gateleen-security/pom.xml index 0fc3067c4..c6c168a6e 100644 --- a/gateleen-security/pom.xml +++ b/gateleen-security/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-security diff --git a/gateleen-test/pom.xml b/gateleen-test/pom.xml index 8611850de..839e8f5e8 100644 --- a/gateleen-test/pom.xml +++ b/gateleen-test/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-test jar diff --git a/gateleen-testhelper/pom.xml b/gateleen-testhelper/pom.xml index 05882f11d..56337c9b5 100644 --- a/gateleen-testhelper/pom.xml +++ b/gateleen-testhelper/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-testhelper diff --git a/gateleen-user/pom.xml b/gateleen-user/pom.xml index 4f69e7b6d..c25f49fc0 100644 --- a/gateleen-user/pom.xml +++ b/gateleen-user/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-user diff --git a/gateleen-validation/pom.xml b/gateleen-validation/pom.xml index 391d4c537..79688521f 100644 --- a/gateleen-validation/pom.xml +++ b/gateleen-validation/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 gateleen-validation diff --git a/pom.xml b/pom.xml index 5cecd732f..bf3ec6815 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7-SNAPSHOT + 2.1.7 pom gateleen Middleware library based on Vert.x to build advanced JSON/REST communication servers From 65b69f2edacfb332bb6779a0cd613cf017326b31 Mon Sep 17 00:00:00 2001 From: runner Date: Wed, 29 May 2024 07:19:42 +0000 Subject: [PATCH 5/9] updating develop poms to master versions to avoid merge conflicts --- gateleen-cache/pom.xml | 2 +- gateleen-core/pom.xml | 2 +- gateleen-delegate/pom.xml | 2 +- gateleen-delta/pom.xml | 2 +- gateleen-expansion/pom.xml | 2 +- gateleen-hook-js/pom.xml | 2 +- gateleen-hook/pom.xml | 2 +- gateleen-kafka/pom.xml | 2 +- gateleen-logging/pom.xml | 2 +- gateleen-merge/pom.xml | 2 +- gateleen-monitoring/pom.xml | 2 +- gateleen-packing/pom.xml | 2 +- gateleen-player/pom.xml | 2 +- gateleen-playground/pom.xml | 2 +- gateleen-qos/pom.xml | 2 +- gateleen-queue/pom.xml | 2 +- gateleen-routing/pom.xml | 2 +- gateleen-runconfig/pom.xml | 2 +- gateleen-scheduler/pom.xml | 2 +- gateleen-security/pom.xml | 2 +- gateleen-test/pom.xml | 2 +- gateleen-testhelper/pom.xml | 2 +- gateleen-user/pom.xml | 2 +- gateleen-validation/pom.xml | 2 +- pom.xml | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gateleen-cache/pom.xml b/gateleen-cache/pom.xml index ec1ab879e..b9488007d 100644 --- a/gateleen-cache/pom.xml +++ b/gateleen-cache/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-cache diff --git a/gateleen-core/pom.xml b/gateleen-core/pom.xml index 7ca3e99ee..5fdfe1461 100644 --- a/gateleen-core/pom.xml +++ b/gateleen-core/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-core diff --git a/gateleen-delegate/pom.xml b/gateleen-delegate/pom.xml index 76f734231..92b70132a 100644 --- a/gateleen-delegate/pom.xml +++ b/gateleen-delegate/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-delegate diff --git a/gateleen-delta/pom.xml b/gateleen-delta/pom.xml index 707c2b705..2cab32748 100644 --- a/gateleen-delta/pom.xml +++ b/gateleen-delta/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-delta diff --git a/gateleen-expansion/pom.xml b/gateleen-expansion/pom.xml index 6fd869f93..ca0e63717 100644 --- a/gateleen-expansion/pom.xml +++ b/gateleen-expansion/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-expansion diff --git a/gateleen-hook-js/pom.xml b/gateleen-hook-js/pom.xml index 6790dd29b..2f553afb0 100644 --- a/gateleen-hook-js/pom.xml +++ b/gateleen-hook-js/pom.xml @@ -4,7 +4,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-hook-js jar diff --git a/gateleen-hook/pom.xml b/gateleen-hook/pom.xml index 957613927..05f417bdb 100644 --- a/gateleen-hook/pom.xml +++ b/gateleen-hook/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-hook diff --git a/gateleen-kafka/pom.xml b/gateleen-kafka/pom.xml index ab53b09fe..e5caba904 100644 --- a/gateleen-kafka/pom.xml +++ b/gateleen-kafka/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-kafka diff --git a/gateleen-logging/pom.xml b/gateleen-logging/pom.xml index 446f61684..82187638a 100644 --- a/gateleen-logging/pom.xml +++ b/gateleen-logging/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-logging diff --git a/gateleen-merge/pom.xml b/gateleen-merge/pom.xml index a33161ac6..c121f9588 100644 --- a/gateleen-merge/pom.xml +++ b/gateleen-merge/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-merge diff --git a/gateleen-monitoring/pom.xml b/gateleen-monitoring/pom.xml index 4242c1777..9ed1c515f 100644 --- a/gateleen-monitoring/pom.xml +++ b/gateleen-monitoring/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-monitoring diff --git a/gateleen-packing/pom.xml b/gateleen-packing/pom.xml index 00d804238..30fe8a174 100644 --- a/gateleen-packing/pom.xml +++ b/gateleen-packing/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-packing diff --git a/gateleen-player/pom.xml b/gateleen-player/pom.xml index 32e1414f7..12b84c92e 100644 --- a/gateleen-player/pom.xml +++ b/gateleen-player/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-player diff --git a/gateleen-playground/pom.xml b/gateleen-playground/pom.xml index 50e9ac122..cd0b16d30 100644 --- a/gateleen-playground/pom.xml +++ b/gateleen-playground/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-playground diff --git a/gateleen-qos/pom.xml b/gateleen-qos/pom.xml index 8cca1b4c2..e3554929f 100644 --- a/gateleen-qos/pom.xml +++ b/gateleen-qos/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-qos diff --git a/gateleen-queue/pom.xml b/gateleen-queue/pom.xml index 5f42bd0a2..efb7e59c9 100644 --- a/gateleen-queue/pom.xml +++ b/gateleen-queue/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-queue diff --git a/gateleen-routing/pom.xml b/gateleen-routing/pom.xml index 85ab49b46..dec2f7157 100644 --- a/gateleen-routing/pom.xml +++ b/gateleen-routing/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-routing diff --git a/gateleen-runconfig/pom.xml b/gateleen-runconfig/pom.xml index c6e4daa80..d72ba1fca 100644 --- a/gateleen-runconfig/pom.xml +++ b/gateleen-runconfig/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-runconfig diff --git a/gateleen-scheduler/pom.xml b/gateleen-scheduler/pom.xml index 25367dc43..6b6cb78da 100644 --- a/gateleen-scheduler/pom.xml +++ b/gateleen-scheduler/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-scheduler diff --git a/gateleen-security/pom.xml b/gateleen-security/pom.xml index 9173fc016..c6c168a6e 100644 --- a/gateleen-security/pom.xml +++ b/gateleen-security/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-security diff --git a/gateleen-test/pom.xml b/gateleen-test/pom.xml index 79bc6c1a2..839e8f5e8 100644 --- a/gateleen-test/pom.xml +++ b/gateleen-test/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-test jar diff --git a/gateleen-testhelper/pom.xml b/gateleen-testhelper/pom.xml index ec439ba52..56337c9b5 100644 --- a/gateleen-testhelper/pom.xml +++ b/gateleen-testhelper/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-testhelper diff --git a/gateleen-user/pom.xml b/gateleen-user/pom.xml index 92cc2d300..c25f49fc0 100644 --- a/gateleen-user/pom.xml +++ b/gateleen-user/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-user diff --git a/gateleen-validation/pom.xml b/gateleen-validation/pom.xml index 5afcddce0..79688521f 100644 --- a/gateleen-validation/pom.xml +++ b/gateleen-validation/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 gateleen-validation diff --git a/pom.xml b/pom.xml index 19ae1663a..bf3ec6815 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.8-SNAPSHOT + 2.1.7 pom gateleen Middleware library based on Vert.x to build advanced JSON/REST communication servers From f826cd8c564c2d708b49a3dacce248e1993d5148 Mon Sep 17 00:00:00 2001 From: runner Date: Wed, 29 May 2024 07:19:44 +0000 Subject: [PATCH 6/9] Updating develop poms back to pre merge state --- gateleen-cache/pom.xml | 2 +- gateleen-core/pom.xml | 2 +- gateleen-delegate/pom.xml | 2 +- gateleen-delta/pom.xml | 2 +- gateleen-expansion/pom.xml | 2 +- gateleen-hook-js/pom.xml | 2 +- gateleen-hook/pom.xml | 2 +- gateleen-kafka/pom.xml | 2 +- gateleen-logging/pom.xml | 2 +- gateleen-merge/pom.xml | 2 +- gateleen-monitoring/pom.xml | 2 +- gateleen-packing/pom.xml | 2 +- gateleen-player/pom.xml | 2 +- gateleen-playground/pom.xml | 2 +- gateleen-qos/pom.xml | 2 +- gateleen-queue/pom.xml | 2 +- gateleen-routing/pom.xml | 2 +- gateleen-runconfig/pom.xml | 2 +- gateleen-scheduler/pom.xml | 2 +- gateleen-security/pom.xml | 2 +- gateleen-test/pom.xml | 2 +- gateleen-testhelper/pom.xml | 2 +- gateleen-user/pom.xml | 2 +- gateleen-validation/pom.xml | 2 +- pom.xml | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gateleen-cache/pom.xml b/gateleen-cache/pom.xml index b9488007d..ec1ab879e 100644 --- a/gateleen-cache/pom.xml +++ b/gateleen-cache/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-cache diff --git a/gateleen-core/pom.xml b/gateleen-core/pom.xml index 5fdfe1461..7ca3e99ee 100644 --- a/gateleen-core/pom.xml +++ b/gateleen-core/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-core diff --git a/gateleen-delegate/pom.xml b/gateleen-delegate/pom.xml index 92b70132a..76f734231 100644 --- a/gateleen-delegate/pom.xml +++ b/gateleen-delegate/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-delegate diff --git a/gateleen-delta/pom.xml b/gateleen-delta/pom.xml index 2cab32748..707c2b705 100644 --- a/gateleen-delta/pom.xml +++ b/gateleen-delta/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-delta diff --git a/gateleen-expansion/pom.xml b/gateleen-expansion/pom.xml index ca0e63717..6fd869f93 100644 --- a/gateleen-expansion/pom.xml +++ b/gateleen-expansion/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-expansion diff --git a/gateleen-hook-js/pom.xml b/gateleen-hook-js/pom.xml index 2f553afb0..6790dd29b 100644 --- a/gateleen-hook-js/pom.xml +++ b/gateleen-hook-js/pom.xml @@ -4,7 +4,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-hook-js jar diff --git a/gateleen-hook/pom.xml b/gateleen-hook/pom.xml index 05f417bdb..957613927 100644 --- a/gateleen-hook/pom.xml +++ b/gateleen-hook/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-hook diff --git a/gateleen-kafka/pom.xml b/gateleen-kafka/pom.xml index e5caba904..ab53b09fe 100644 --- a/gateleen-kafka/pom.xml +++ b/gateleen-kafka/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-kafka diff --git a/gateleen-logging/pom.xml b/gateleen-logging/pom.xml index 82187638a..446f61684 100644 --- a/gateleen-logging/pom.xml +++ b/gateleen-logging/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-logging diff --git a/gateleen-merge/pom.xml b/gateleen-merge/pom.xml index c121f9588..a33161ac6 100644 --- a/gateleen-merge/pom.xml +++ b/gateleen-merge/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-merge diff --git a/gateleen-monitoring/pom.xml b/gateleen-monitoring/pom.xml index 9ed1c515f..4242c1777 100644 --- a/gateleen-monitoring/pom.xml +++ b/gateleen-monitoring/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-monitoring diff --git a/gateleen-packing/pom.xml b/gateleen-packing/pom.xml index 30fe8a174..00d804238 100644 --- a/gateleen-packing/pom.xml +++ b/gateleen-packing/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-packing diff --git a/gateleen-player/pom.xml b/gateleen-player/pom.xml index 12b84c92e..32e1414f7 100644 --- a/gateleen-player/pom.xml +++ b/gateleen-player/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-player diff --git a/gateleen-playground/pom.xml b/gateleen-playground/pom.xml index cd0b16d30..50e9ac122 100644 --- a/gateleen-playground/pom.xml +++ b/gateleen-playground/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-playground diff --git a/gateleen-qos/pom.xml b/gateleen-qos/pom.xml index e3554929f..8cca1b4c2 100644 --- a/gateleen-qos/pom.xml +++ b/gateleen-qos/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-qos diff --git a/gateleen-queue/pom.xml b/gateleen-queue/pom.xml index efb7e59c9..5f42bd0a2 100644 --- a/gateleen-queue/pom.xml +++ b/gateleen-queue/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-queue diff --git a/gateleen-routing/pom.xml b/gateleen-routing/pom.xml index dec2f7157..85ab49b46 100644 --- a/gateleen-routing/pom.xml +++ b/gateleen-routing/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-routing diff --git a/gateleen-runconfig/pom.xml b/gateleen-runconfig/pom.xml index d72ba1fca..c6e4daa80 100644 --- a/gateleen-runconfig/pom.xml +++ b/gateleen-runconfig/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-runconfig diff --git a/gateleen-scheduler/pom.xml b/gateleen-scheduler/pom.xml index 6b6cb78da..25367dc43 100644 --- a/gateleen-scheduler/pom.xml +++ b/gateleen-scheduler/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-scheduler diff --git a/gateleen-security/pom.xml b/gateleen-security/pom.xml index c6c168a6e..9173fc016 100644 --- a/gateleen-security/pom.xml +++ b/gateleen-security/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-security diff --git a/gateleen-test/pom.xml b/gateleen-test/pom.xml index 839e8f5e8..79bc6c1a2 100644 --- a/gateleen-test/pom.xml +++ b/gateleen-test/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-test jar diff --git a/gateleen-testhelper/pom.xml b/gateleen-testhelper/pom.xml index 56337c9b5..ec439ba52 100644 --- a/gateleen-testhelper/pom.xml +++ b/gateleen-testhelper/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-testhelper diff --git a/gateleen-user/pom.xml b/gateleen-user/pom.xml index c25f49fc0..92cc2d300 100644 --- a/gateleen-user/pom.xml +++ b/gateleen-user/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-user diff --git a/gateleen-validation/pom.xml b/gateleen-validation/pom.xml index 79688521f..5afcddce0 100644 --- a/gateleen-validation/pom.xml +++ b/gateleen-validation/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT gateleen-validation diff --git a/pom.xml b/pom.xml index bf3ec6815..19ae1663a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.swisspush.gateleen gateleen - 2.1.7 + 2.1.8-SNAPSHOT pom gateleen Middleware library based on Vert.x to build advanced JSON/REST communication servers From 46016a29b2d5c0f06b1f0e3b84378abedcb3fe8a Mon Sep 17 00:00:00 2001 From: Andreas Fankhauser <23085769+hiddenalpha@users.noreply.github.com> Date: Thu, 30 May 2024 11:03:40 +0200 Subject: [PATCH 7/9] Make use of ExceptionFactory Related: SDCISA-15833, https://github.com/swisspost/vertx-redisques/issues/170, https://github.com/swisspost/vertx-redisques/pull/177, https://github.com/swisspost/vertx-rest-storage/pull/186, https://github.com/swisspost/gateleen/pull/577, https://github.com/swisspost/vertx-redisques/pull/181, https://github.com/swisspost/gateleen/issues/493, https://github.com/swisspost/vertx-rest-storage/issues/188 --- .../exception/GateleenExceptionFactory.java | 8 ++++++ .../GateleenThriftyExceptionFactory.java | 6 +++++ .../GateleenWastefulExceptionFactory.java | 5 ++++ .../NoStackIllegalStateException.java | 26 +++++++++++++++++++ .../gateleen/core/http/LocalHttpClient.java | 2 +- .../core/http/LocalHttpServerResponse.java | 10 ++++--- 6 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 gateleen-core/src/main/java/org/swisspush/gateleen/core/exception/NoStackIllegalStateException.java diff --git a/gateleen-core/src/main/java/org/swisspush/gateleen/core/exception/GateleenExceptionFactory.java b/gateleen-core/src/main/java/org/swisspush/gateleen/core/exception/GateleenExceptionFactory.java index af7db1e55..6e0ab500b 100644 --- a/gateleen-core/src/main/java/org/swisspush/gateleen/core/exception/GateleenExceptionFactory.java +++ b/gateleen-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/gateleen-core/src/main/java/org/swisspush/gateleen/core/exception/GateleenThriftyExceptionFactory.java b/gateleen-core/src/main/java/org/swisspush/gateleen/core/exception/GateleenThriftyExceptionFactory.java index 1a26ae481..1ce9631ab 100644 --- a/gateleen-core/src/main/java/org/swisspush/gateleen/core/exception/GateleenThriftyExceptionFactory.java +++ b/gateleen-core/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/gateleen-core/src/main/java/org/swisspush/gateleen/core/exception/GateleenWastefulExceptionFactory.java b/gateleen-core/src/main/java/org/swisspush/gateleen/core/exception/GateleenWastefulExceptionFactory.java index 1fc0889ca..b15e3719a 100644 --- a/gateleen-core/src/main/java/org/swisspush/gateleen/core/exception/GateleenWastefulExceptionFactory.java +++ b/gateleen-core/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/gateleen-core/src/main/java/org/swisspush/gateleen/core/exception/NoStackIllegalStateException.java b/gateleen-core/src/main/java/org/swisspush/gateleen/core/exception/NoStackIllegalStateException.java new file mode 100644 index 000000000..e773a9c05 --- /dev/null +++ b/gateleen-core/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 index 2d02b7efd..823a4c655 100644 --- 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 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 index 75f8a6a7e..0f1cd1cab 100644 --- 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 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 write(String chunk, String enc) { public Future 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.debug("non-proper HttpServerResponse occured", ex); + logger.debug("non-proper HttpServerResponse occurred", ex); throw ex; } ensureBound(); From 0e721252444682ed6bc58d2e3aec6fbfe2c197b2 Mon Sep 17 00:00:00 2001 From: Andreas Fankhauser <23085769+hiddenalpha@users.noreply.github.com> Date: Thu, 30 May 2024 11:06:30 +0200 Subject: [PATCH 8/9] Fix test Related: SDCISA-15833, https://github.com/swisspost/vertx-redisques/issues/170, https://github.com/swisspost/vertx-redisques/pull/177, https://github.com/swisspost/vertx-rest-storage/pull/186, https://github.com/swisspost/gateleen/pull/577, https://github.com/swisspost/vertx-redisques/pull/181, https://github.com/swisspost/gateleen/issues/493, https://github.com/swisspost/vertx-rest-storage/issues/188 --- .../swisspush/gateleen/queue/queuing/QueueProcessorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index c05d9d3e3..b9c0c0c19 100644 --- 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> handler) { FastFaiHttpClientResponse response = new FastFaiHttpClientResponse() { From 5c5dd9e0b7aff69eeaa3cd937932ee9091a8061a Mon Sep 17 00:00:00 2001 From: Andreas Fankhauser <23085769+hiddenalpha@users.noreply.github.com> Date: Mon, 3 Jun 2024 15:32:30 +0200 Subject: [PATCH 9/9] Do less work if result is ignored anyway --- .../org/swisspush/gateleen/logging/RequestPropertyFilter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 index c33d7a24b..291762a86 100644 --- 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,6 +81,7 @@ 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"); @@ -88,7 +89,7 @@ private static void logFilterResult(HttpServerRequest request, String filterProp sb.append(" with filterProperty ").append(filterPropertyKey).append("=").append(filterPropertyValue); } sb.append(" has FilterResult ").append(filterResult.name()); - log.info(sb.toString()); + log.info("{}", sb); } } }