merge to master to trigger release

gateleen-cache/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-cache</artifactId>

gateleen-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-core</artifactId>

gateleen-delegate/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-delegate</artifactId>

gateleen-delta/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-delta</artifactId>

gateleen-expansion/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-expansion</artifactId>

gateleen-hook-js/package.json

@@ -35,7 +35,7 @@
     "grunt-ngdocs": "0.2.10",
     "jasmine-core": "2.5.0",
     "jshint": "2.9.3",
-    "karma": "1.2.0",
+    "karma": "6.3.9",
     "karma-chrome-launcher": "2.2.0",
     "karma-coverage": "1.1.1",
     "karma-html-reporter": "0.2.7",

gateleen-hook-js/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
     <artifactId>gateleen-hook-js</artifactId>
     <packaging>jar</packaging>
@@ -81,7 +81,7 @@
                         <!-- we need node in phase generate-resources, so do this before-->
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v8.9.4</nodeVersion>
+                            <nodeVersion>v16.9.1</nodeVersion>
                             <npmVersion>6.14.8</npmVersion>
                             <nodeDownloadRoot>${nodeDownloadRoot}</nodeDownloadRoot>
                             <npmDownloadRoot>${npmDownloadRoot}</npmDownloadRoot>

gateleen-hook/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-hook</artifactId>

gateleen-kafka/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-kafka</artifactId>

gateleen-logging/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-logging</artifactId>

gateleen-merge/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-merge</artifactId>

gateleen-monitoring/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-monitoring</artifactId>

gateleen-monitoring/src/main/java/org/swisspush/gateleen/monitoring/MonitoringHandler.java

@@ -353,7 +353,7 @@
             if (metricName != null) {
                 double duration = (System.nanoTime() - startTime) / 1000000d;
                 vertx.eventBus().publish(getMonitoringAddress(),
-                        new JsonObject().put(METRIC_NAME, prefix + "routing." + metricName + ".duration").put(METRIC_ACTION, "update").put("n", duration));
+                        new JsonObject().put(METRIC_NAME, prefix + "routing." + metricName + ".duration").put(METRIC_ACTION, "set").put("n", duration));
             }
             updatePendingRequestCount(false);
         }
@@ -389,7 +389,7 @@
         vertx.eventBus().request(getRedisquesAddress(), buildGetQueueItemsCountOperation(queue), (Handler<AsyncResult<Message<JsonObject>>>) reply -> {
             if (reply.succeeded() && OK.equals(reply.result().body().getString(STATUS))) {
                 final long count = reply.result().body().getLong(VALUE);
-                vertx.eventBus().publish(getMonitoringAddress(), new JsonObject().put(METRIC_NAME, prefix + LAST_USED_QUEUE_SIZE_METRIC).put(METRIC_ACTION, "update").put("n", count));
+                vertx.eventBus().publish(getMonitoringAddress(), new JsonObject().put(METRIC_NAME, prefix + LAST_USED_QUEUE_SIZE_METRIC).put(METRIC_ACTION, "set").put("n", count));
             } else {
                 log.error("Error gathering queue size for queue '{}'", queue);
             }

gateleen-packing/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-packing</artifactId>

gateleen-player/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-player</artifactId>

gateleen-playground/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-playground</artifactId>

gateleen-playground/src/main/resources/playground/server/admin/v1/routing/rules

@@ -62,6 +62,11 @@
     "description": "CircuitBreaker API",
     "url": "http://localhost:7013/playground/server/queuecircuitbreaker/circuit/$1"
   },
+  "/playground/server/queuing/(.*)": {
+    "description": "Redisques API",
+    "metricName": "server-queuing-api",
+    "url": "http://localhost:7015/queuing/$1"
+  },
   "/playground/server/redisques/(.*)": {
     "description": "Redisques API",
     "url": "http://localhost:7015/queuing/$1"

gateleen-qos/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-qos</artifactId>

gateleen-queue/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-queue</artifactId>

gateleen-routing/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-routing</artifactId>

gateleen-runconfig/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-runconfig</artifactId>

gateleen-runconfig/src/main/java/org/swisspush/gateleen/runconfig/RunConfig.java

@@ -437,6 +437,7 @@ public static JsonObject buildRedisquesConfig() {
                 .address(Address.redisquesAddress())
                 .processorAddress(Address.queueProcessorAddress())
                 .httpRequestHandlerEnabled(true)
+                .enableQueueNameDecoding(false)
                 .httpRequestHandlerPort(7015)
                 .redisReconnectAttempts(-1)
                 .redisPoolRecycleTimeoutMs(-1)

gateleen-scheduler/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-scheduler</artifactId>

gateleen-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-security</artifactId>

gateleen-test/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
     <artifactId>gateleen-test</artifactId>
     <packaging>jar</packaging>

gateleen-test/src/test/java/org/swisspush/gateleen/core/monitoring/MonitoringTest.java

@@ -29,10 +29,6 @@
 @RunWith(VertxUnitRunner.class)
 public class MonitoringTest extends AbstractTest {
     Logger log = LoggerFactory.getLogger(MonitoringTest.class);
-
-    private static final long MAX_DURATION_THRESHOLD = 100;
-    private static final double MEAN_DURATION_THRESHOLD = 25.0;
-
     /**
      * Overwrite RestAssured configuration
      */
@@ -95,17 +91,7 @@ public void testStorageMetrics(TestContext context) throws Exception {
 
         // read the jmx infos
         if (mbs.isRegistered(beanNameObject)) {
-            log.info(" > Min:    {}", mbs.getAttribute(beanNameObject, "Min"));
-            log.info(" > Mean:   {}", mbs.getAttribute(beanNameObject, "Mean"));
-            log.info(" > Max:    {}", mbs.getAttribute(beanNameObject, "Max"));
-            log.info(" > Count:  {}", mbs.getAttribute(beanNameObject, "Count"));
-            log.info(" > StdDev: {}", mbs.getAttribute(beanNameObject, "StdDev"));
-
-            // check max threshold
-            context.assertTrue((Long) mbs.getAttribute(beanNameObject, "Max") <= MAX_DURATION_THRESHOLD, "'Max' should be below the threshold");
-
-            // checm mean threshold
-            context.assertTrue((Double) mbs.getAttribute(beanNameObject, "Mean") <= MEAN_DURATION_THRESHOLD, "'Mean' should be below the threshold");
+            log.info(" > Value:    {}", mbs.getAttribute(beanNameObject, "Value"));
         } else {
             context.fail("could not found mbean " + beanName);
         }

gateleen-test/src/test/java/org/swisspush/gateleen/hook/HookQueueingStrategiesTest.java

@@ -78,18 +78,18 @@ public void testDiscardPayloadQueueingStrategy(TestContext context) {
         when().get("pushnotification/queuing/queues/")
                 .then().assertThat()
                 .body("queues", hasItem(queueName));
-        given().urlEncodingEnabled(true).when().get("pushnotification/queuing/queues/" + queueName)
+        given().urlEncodingEnabled(false).when().get("pushnotification/queuing/queues/" + queueName)
                 .then().assertThat()
                 .body(queueName, hasSize(3));
 
         // check that no queue items do have a payload
-        String responseIndex0 = given().urlEncodingEnabled(true)
+        String responseIndex0 = given().urlEncodingEnabled(false)
                 .when().get("pushnotification/queuing/queues/" + queueName + "/0")
                 .then().extract().response().asString();
-        String responseIndex1 = given().urlEncodingEnabled(true)
+        String responseIndex1 = given().urlEncodingEnabled(false)
                 .when().get("pushnotification/queuing/queues/" + queueName + "/1")
                 .then().extract().response().asString();
-        String responseIndex2 = given().urlEncodingEnabled(true)
+        String responseIndex2 = given().urlEncodingEnabled(false)
                 .when().get("pushnotification/queuing/queues/" + queueName + "/2")
                 .then().extract().response().asString();
 
@@ -147,7 +147,7 @@ public void testReducedPropagationQueueingStrategy(TestContext context) {
                 .then().assertThat()
                 .body("queues", hasItem(queueName))
                 .body("queues", not(hasItem(managerQueue)));
-        given().urlEncodingEnabled(true).when().get("pushnotification/queuing/queues/" + queueName)
+        given().urlEncodingEnabled(false).when().get("pushnotification/queuing/queues/" + queueName)
                 .then().assertThat()
                 .body(queueName, hasSize(3));
         when().get("pushnotification/queuing/locks/")
@@ -158,10 +158,10 @@ public void testReducedPropagationQueueingStrategy(TestContext context) {
         // after 5s an unlocked manager queue with a single queue item should exist and the original queue should be empty
         // and its lock should have been deleted
         Awaitility.await().untilAsserted(() -> when().get("pushnotification/queuing/queues/").then().assertThat().body("queues", hasItem(managerQueue)));
-        given().urlEncodingEnabled(true).when().get("pushnotification/queuing/queues/" + managerQueue)
+        given().urlEncodingEnabled(false).when().get("pushnotification/queuing/queues/" + managerQueue)
                 .then().assertThat()
                 .body(managerQueue, hasSize(1));
-        given().urlEncodingEnabled(true).when().get("pushnotification/queuing/queues/" + queueName)
+        given().urlEncodingEnabled(false).when().get("pushnotification/queuing/queues/" + queueName)
                 .then().assertThat()
                 .body(queueName, empty());
 
@@ -181,7 +181,7 @@ public void testReducedPropagationQueueingStrategy(TestContext context) {
                 .then().assertThat()
                 .body("queues", hasItem(queueName))
                 .body("queues", hasItem(managerQueue));
-        given().urlEncodingEnabled(true).when().get("pushnotification/queuing/queues/" + queueName)
+        given().urlEncodingEnabled(false).when().get("pushnotification/queuing/queues/" + queueName)
                 .then().assertThat()
                 .body(queueName, hasSize(2));
         when().get("pushnotification/queuing/locks/")
@@ -193,10 +193,10 @@ public void testReducedPropagationQueueingStrategy(TestContext context) {
         // and its lock should have been deleted
         TestUtils.waitSomeTime(5);
         Awaitility.await().untilAsserted(() -> when().get("pushnotification/queuing/queues/").then().assertThat().body("queues", hasItem(managerQueue)));
-        given().urlEncodingEnabled(true).when().get("pushnotification/queuing/queues/" + managerQueue)
+        given().urlEncodingEnabled(false).when().get("pushnotification/queuing/queues/" + managerQueue)
                 .then().assertThat()
                 .body(managerQueue, hasSize(1));
-        given().urlEncodingEnabled(true).when().get("pushnotification/queuing/queues/" + queueName)
+        given().urlEncodingEnabled(false).when().get("pushnotification/queuing/queues/" + queueName)
                 .then().assertThat()
                 .body(queueName, empty());
 

gateleen-testhelper/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-testhelper</artifactId>

gateleen-user/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-user</artifactId>

gateleen-validation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.swisspush.gateleen</groupId>
         <artifactId>gateleen</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>gateleen-validation</artifactId>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.swisspush.gateleen</groupId>
     <artifactId>gateleen</artifactId>
-    <version>2.1.10-SNAPSHOT</version>
+    <version>2.1.11-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>gateleen</name>
     <description>Middleware library based on Vert.x to build advanced JSON/REST communication servers</description>