service task params fix

Author: slistl

docker/all-in-one/build.sh

@@ -37,4 +37,4 @@ cd $BASE_PWD
 
 echo "Building Docker image for version: $FLOWABLE_VERSION"
 
-docker build -t adito/flowable:2022.0.3.1 .
+docker build -t adito/flowable:2022.0.3.2 .

docker/base-image/assets/flowable-idm.war.original

@@ -37,4 +37,4 @@ cd $BASE_PWD
 
 echo "Building Docker image for version: $FLOWABLE_VERSION"
 
-docker build -t adito/flowable:2022.0.3.1 .
+docker build -t adito/flowable:2022.0.3.2 .

docker/base-image/assets/flowable-modeler.war.original

@@ -1,5 +1,6 @@
 package org.flowable.aditoDataService;
 
+import com.google.gson.Gson;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
@@ -101,19 +102,21 @@ private void loadEndpointConfigFromSpring(String springAditoBaseUrl, String spri
 
     public String get(String url, MultiValueMap<String, String> queryParams, Map<String,String> headers)
     {
-
+        WebClient.RequestHeadersUriSpec<?> spec = getWebClient().get();
         if (queryParams == null || queryParams.isEmpty())
-            return get(url);
-        WebClient.RequestHeadersSpec<?> spec = getWebClient().get().uri(uriBuilder -> uriBuilder.path(url).queryParams(queryParams).build());
+            spec.uri(url);
+        else
+            spec.uri(uriBuilder -> uriBuilder.path(url).queryParams(queryParams).build());
+
         if (headers != null)
             headers.forEach(spec::header);
+        logger.info("headers: " + new Gson().toJson(headers));
         return spec.retrieve().bodyToMono(String.class).block();
     }
 
     protected String get(String url)
     {
-        WebClient.RequestHeadersSpec<?> spec = getWebClient().get().uri(url);
-        return spec.retrieve().bodyToMono(String.class).block();
+        return get(url, null, null);
     }
 
 }