Fix build. No idea why this other overlaod is broken.

(wip @ 96a7efc)
swisspost · Jun 30, 2023 · d036b62 · d036b62
1 parent 67f673e
commit d036b62
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -12,6 +12,7 @@ on:
 jobs:
   build_maven:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v3

diff --git a/gateleen-expansion/src/main/java/org/swisspush/gateleen/expansion/ExpansionHandler.java b/gateleen-expansion/src/main/java/org/swisspush/gateleen/expansion/ExpansionHandler.java
@@ -502,7 +502,7 @@ private void makeStorageExpandRequest(final String targetUri, final List subReso
         Logger log = RequestLoggerFactory.getLogger(ExpansionHandler.class, req);
         HttpMethod reqMethod = HttpMethod.POST;
         String reqUri = targetUri + "?storageExpand=true";
-        httpClient.request(reqMethod, reqUri, asyncResult -> {
+        httpClient.request(reqMethod, reqUri).onComplete(asyncResult -> {
             if (asyncResult.failed()) {
                 log.warn("Failed request to {}: {}", targetUri + "?storageExpand=true", asyncResult.cause());
                 return;

diff --git a/gateleen-hook/src/main/java/org/swisspush/gateleen/hook/HookHandler.java b/gateleen-hook/src/main/java/org/swisspush/gateleen/hook/HookHandler.java
@@ -504,22 +504,25 @@ public boolean handle(final RoutingContext ctx) {
         /*
          * 1) Un- / Register Listener / Routes
          */
-        if (request.method() == PUT) {
-            if (request.uri().contains(HOOKS_LISTENERS_URI_PART)) {
+        var requestMethod = request.method();
+        if (requestMethod == PUT) {
+            var requestUri = request.uri();
+            if (requestUri.contains(HOOKS_LISTENERS_URI_PART)) {
                 handleListenerRegistration(request);
                 return true;
             }
-            if (request.uri().contains(HOOKS_ROUTE_URI_PART)) {
+            if (requestUri.contains(HOOKS_ROUTE_URI_PART)) {
                 handleRouteRegistration(request);
                 return true;
             }
         }
-        if (request.method() == DELETE) {
-            if (request.uri().contains(HOOKS_LISTENERS_URI_PART)) {
+        if (requestMethod == DELETE) {
+            var requestUri = request.uri();
+            if (requestUri.contains(HOOKS_LISTENERS_URI_PART)) {
                 handleListenerUnregistration(request);
                 return true;
             }
-            if (request.uri().contains(HOOKS_ROUTE_URI_PART)) {
+            if (requestUri.contains(HOOKS_ROUTE_URI_PART)) {
                 handleRouteUnregistration(request);
                 return true;
             }