add configuration methods for the queue middleware

commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/defaultconfig/ApiRootBuilder.java

@@ -2,6 +2,7 @@
 package com.commercetools.api.defaultconfig;
 
 import java.net.URI;
+import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -406,6 +407,33 @@ public ApiRootBuilder withRetryMiddleware(final Scheduler scheduler, final int m
         return with(clientBuilder -> clientBuilder.withRetryMiddleware(scheduler, maxRetries, delay, maxDelay, fn));
     }
 
+    public ApiRootBuilder withQueueMiddleware(final Supplier<QueueRequestMiddleware> queueMiddleware) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(queueMiddleware));
+    }
+
+    public ApiRootBuilder withQueueMiddleware(final QueueRequestMiddleware queueMiddleware) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(queueMiddleware));
+    }
+
+    public ApiRootBuilder withQueueMiddleware(final int maxRequests, final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(maxRequests, maxWaitTime));
+    }
+
+    public ApiRootBuilder withQueueMiddleware(final Scheduler scheduler, final int maxRequests,
+            final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(scheduler, maxRequests, maxWaitTime));
+    }
+
+    public ApiRootBuilder withQueueMiddleware(final ScheduledExecutorService executorService, final int maxRequests,
+            final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(executorService, maxRequests, maxWaitTime));
+    }
+
+    public ApiRootBuilder withQueueMiddleware(final ExecutorService executorService, final int maxRequests,
+            final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(executorService, maxRequests, maxWaitTime));
+    }
+
     public ApiRootBuilder withOAuthMiddleware(final Supplier<OAuthMiddleware> oAuthMiddleware) {
         return with(clientBuilder -> clientBuilder.withOAuthMiddleware(oAuthMiddleware));
     }

commercetools/commercetools-sdk-java-history/src/main/java/com/commercetools/history/defaultconfig/HistoryApiRootBuilder.java

@@ -2,10 +2,14 @@
 package com.commercetools.history.defaultconfig;
 
 import java.net.URI;
+import java.time.Duration;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import javax.annotation.Nullable;
 
@@ -14,6 +18,8 @@
 import com.commercetools.history.client.HistoryCorrelationIdProvider;
 import com.commercetools.history.client.ProjectApiRoot;
 
+import dev.failsafe.spi.Scheduler;
+
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.error.HttpExceptionFactory;
 import io.vrap.rmf.base.client.http.*;
@@ -254,6 +260,33 @@ public HistoryApiRootBuilder withOAuthMiddleware(final Supplier<OAuthMiddleware>
         return this;
     }
 
+    public HistoryApiRootBuilder withQueueMiddleware(final Supplier<QueueRequestMiddleware> queueMiddleware) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(queueMiddleware));
+    }
+
+    public HistoryApiRootBuilder withQueueMiddleware(final QueueRequestMiddleware queueMiddleware) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(queueMiddleware));
+    }
+
+    public HistoryApiRootBuilder withQueueMiddleware(final int maxRequests, final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(maxRequests, maxWaitTime));
+    }
+
+    public HistoryApiRootBuilder withQueueMiddleware(final Scheduler scheduler, final int maxRequests,
+            final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(scheduler, maxRequests, maxWaitTime));
+    }
+
+    public HistoryApiRootBuilder withQueueMiddleware(final ScheduledExecutorService executorService,
+            final int maxRequests, final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(executorService, maxRequests, maxWaitTime));
+    }
+
+    public HistoryApiRootBuilder withQueueMiddleware(final ExecutorService executorService, final int maxRequests,
+            final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(executorService, maxRequests, maxWaitTime));
+    }
+
     public HistoryApiRootBuilder withOAuthMiddleware(final OAuthMiddleware oAuthMiddleware) {
         builder.withOAuthMiddleware(oAuthMiddleware);
 
@@ -353,6 +386,12 @@ public HistoryApiRootBuilder addMiddlewares(final List<Middleware> middlewares)
         return this;
     }
 
+    public HistoryApiRootBuilder with(UnaryOperator<ClientBuilder> builderUnaryOperator) {
+        builderUnaryOperator.apply(builder);
+
+        return this;
+    }
+
     public ApiRoot build() {
         return ApiRoot.fromClient(clientSupplier().get());
     }

commercetools/commercetools-sdk-java-importapi/src/main/java/com/commercetools/importapi/defaultconfig/ImportApiRootBuilder.java

@@ -2,10 +2,14 @@
 package com.commercetools.importapi.defaultconfig;
 
 import java.net.URI;
+import java.time.Duration;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import javax.annotation.Nullable;
 
@@ -14,6 +18,8 @@
 import com.commercetools.importapi.client.ImportCorrelationIdProvider;
 import com.commercetools.importapi.client.ProjectApiRoot;
 
+import dev.failsafe.spi.Scheduler;
+
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.error.HttpExceptionFactory;
 import io.vrap.rmf.base.client.http.*;
@@ -248,6 +254,33 @@ public ImportApiRootBuilder withRetryMiddleware(final int maxRetries, final long
         return this;
     }
 
+    public ImportApiRootBuilder withQueueMiddleware(final Supplier<QueueRequestMiddleware> queueMiddleware) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(queueMiddleware));
+    }
+
+    public ImportApiRootBuilder withQueueMiddleware(final QueueRequestMiddleware queueMiddleware) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(queueMiddleware));
+    }
+
+    public ImportApiRootBuilder withQueueMiddleware(final int maxRequests, final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(maxRequests, maxWaitTime));
+    }
+
+    public ImportApiRootBuilder withQueueMiddleware(final Scheduler scheduler, final int maxRequests,
+            final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(scheduler, maxRequests, maxWaitTime));
+    }
+
+    public ImportApiRootBuilder withQueueMiddleware(final ScheduledExecutorService executorService,
+            final int maxRequests, final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(executorService, maxRequests, maxWaitTime));
+    }
+
+    public ImportApiRootBuilder withQueueMiddleware(final ExecutorService executorService, final int maxRequests,
+            final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(executorService, maxRequests, maxWaitTime));
+    }
+
     public ImportApiRootBuilder withOAuthMiddleware(final Supplier<OAuthMiddleware> oAuthMiddleware) {
         builder.withOAuthMiddleware(oAuthMiddleware);
 
@@ -353,6 +386,12 @@ public ImportApiRootBuilder addMiddlewares(final List<Middleware> middlewares) {
         return this;
     }
 
+    public ImportApiRootBuilder with(UnaryOperator<ClientBuilder> builderUnaryOperator) {
+        builderUnaryOperator.apply(builder);
+
+        return this;
+    }
+
     public ApiRoot build() {
         return ApiRoot.fromClient(clientSupplier().get());
     }

commercetools/commercetools-sdk-java-ml/src/main/java/com/commercetools/ml/defaultconfig/MLApiRootBuilder.java

@@ -2,10 +2,14 @@
 package com.commercetools.ml.defaultconfig;
 
 import java.net.URI;
+import java.time.Duration;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 
 import javax.annotation.Nullable;
 
@@ -14,6 +18,8 @@
 import com.commercetools.ml.client.MLCorrelationIdProvider;
 import com.commercetools.ml.client.ProjectApiRoot;
 
+import dev.failsafe.spi.Scheduler;
+
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.error.HttpExceptionFactory;
 import io.vrap.rmf.base.client.http.*;
@@ -244,6 +250,33 @@ public MLApiRootBuilder withRetryMiddleware(final int maxRetries, final long del
         return this;
     }
 
+    public MLApiRootBuilder withQueueMiddleware(final Supplier<QueueRequestMiddleware> queueMiddleware) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(queueMiddleware));
+    }
+
+    public MLApiRootBuilder withQueueMiddleware(final QueueRequestMiddleware queueMiddleware) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(queueMiddleware));
+    }
+
+    public MLApiRootBuilder withQueueMiddleware(final int maxRequests, final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(maxRequests, maxWaitTime));
+    }
+
+    public MLApiRootBuilder withQueueMiddleware(final Scheduler scheduler, final int maxRequests,
+            final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(scheduler, maxRequests, maxWaitTime));
+    }
+
+    public MLApiRootBuilder withQueueMiddleware(final ScheduledExecutorService executorService, final int maxRequests,
+            final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(executorService, maxRequests, maxWaitTime));
+    }
+
+    public MLApiRootBuilder withQueueMiddleware(final ExecutorService executorService, final int maxRequests,
+            final Duration maxWaitTime) {
+        return with(clientBuilder -> clientBuilder.withQueueMiddleware(executorService, maxRequests, maxWaitTime));
+    }
+
     public MLApiRootBuilder withOAuthMiddleware(final Supplier<OAuthMiddleware> oAuthMiddleware) {
         builder.withOAuthMiddleware(oAuthMiddleware);
 
@@ -349,6 +382,12 @@ public MLApiRootBuilder addMiddlewares(final List<Middleware> middlewares) {
         return this;
     }
 
+    public MLApiRootBuilder with(UnaryOperator<ClientBuilder> builderUnaryOperator) {
+        builderUnaryOperator.apply(builder);
+
+        return this;
+    }
+
     public ApiRoot build() {
         return ApiRoot.fromClient(clientSupplier().get());
     }

rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/ClientBuilder.java

@@ -4,6 +4,7 @@
 import static java.util.Objects.requireNonNull;
 
 import java.net.URI;
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ForkJoinPool;
@@ -40,6 +41,7 @@ public class ClientBuilder implements Builder<ApiHttpClient> {
     private Supplier<ErrorMiddleware> errorMiddleware;
     private Supplier<OAuthMiddleware> oAuthMiddleware;
     private Supplier<RetryRequestMiddleware> retryMiddleware;
+    private Supplier<QueueRequestMiddleware> queueMiddleware;
     private Supplier<Middleware> correlationIdMiddleware;
     private InternalLoggerMiddleware internalLoggerMiddleware;
     private UserAgentMiddleware userAgentMiddleware;
@@ -155,6 +157,7 @@ private Supplier<HandlerStack> stackSupplier() {
             Optional.ofNullable(userAgentMiddleware).map(middlewareStack::add);
             Optional.ofNullable(oAuthMiddleware).map(m -> middlewareStack.add(m.get()));
             Optional.ofNullable(retryMiddleware).map(m -> middlewareStack.add(m.get()));
+            Optional.ofNullable(queueMiddleware).map(m -> middlewareStack.add(m.get()));
             Optional.ofNullable(correlationIdMiddleware).map(m -> middlewareStack.add(m.get()));
             middlewareStack.addAll(middlewares);
             return HandlerStack.create(HttpHandler.create(requireNonNull(httpClient)), middlewareStack);
@@ -597,6 +600,34 @@ public ClientBuilder withRetryMiddleware(final Scheduler scheduler, final int ma
         return withRetryMiddleware(RetryRequestMiddleware.of(scheduler, maxRetries, delay, maxDelay, fn));
     }
 
+    public ClientBuilder withQueueMiddleware(final Supplier<QueueRequestMiddleware> queueMiddleware) {
+        this.queueMiddleware = queueMiddleware;
+        return this;
+    }
+
+    public ClientBuilder withQueueMiddleware(final QueueRequestMiddleware queueMiddleware) {
+        return withQueueMiddleware(() -> queueMiddleware);
+    }
+
+    public ClientBuilder withQueueMiddleware(final int maxRequests, final Duration maxWaitTime) {
+        return withQueueMiddleware(() -> QueueRequestMiddleware.of(maxRequests, maxWaitTime));
+    }
+
+    public ClientBuilder withQueueMiddleware(final Scheduler scheduler, final int maxRequests,
+            final Duration maxWaitTime) {
+        return withQueueMiddleware(() -> QueueRequestMiddleware.of(scheduler, maxRequests, maxWaitTime));
+    }
+
+    public ClientBuilder withQueueMiddleware(final ScheduledExecutorService executorService, final int maxRequests,
+            final Duration maxWaitTime) {
+        return withQueueMiddleware(() -> QueueRequestMiddleware.of(executorService, maxRequests, maxWaitTime));
+    }
+
+    public ClientBuilder withQueueMiddleware(final ExecutorService executorService, final int maxRequests,
+            final Duration maxWaitTime) {
+        return withQueueMiddleware(() -> QueueRequestMiddleware.of(executorService, maxRequests, maxWaitTime));
+    }
+
     public ClientBuilder withOAuthMiddleware(final Supplier<OAuthMiddleware> oAuthMiddleware) {
         this.oAuthMiddleware = oAuthMiddleware;
         return this;

rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/http/QueueMiddleware.java

@@ -20,7 +20,7 @@
  *
  * @include.example io.vrap.rmf.base.client.QueueMiddlewareTest#queueConfiguration()
  */
-public class QueueMiddleware implements Middleware, AutoCloseable {
+public class QueueMiddleware implements QueueRequestMiddleware, AutoCloseable {
 
     private final FailsafeExecutor<ApiHttpResponse<byte[]>> failsafeExecutor;
 

rmf/rmf-java-base/src/main/java/io/vrap/rmf/base/client/http/QueueRequestMiddleware.java

@@ -0,0 +1,29 @@
+
+package io.vrap.rmf.base.client.http;
+
+import java.time.Duration;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+
+import dev.failsafe.spi.Scheduler;
+
+public interface QueueRequestMiddleware extends Middleware {
+    public static QueueRequestMiddleware of(final ExecutorService executorService, final int maxRequests,
+            final Duration maxWaitTime) {
+        return new QueueMiddleware(executorService, maxRequests, maxWaitTime);
+    }
+
+    public static QueueRequestMiddleware of(final ScheduledExecutorService executorService, final int maxRequests,
+            final Duration maxWaitTime) {
+        return new QueueMiddleware(executorService, maxRequests, maxWaitTime);
+    }
+
+    public static QueueRequestMiddleware of(final Scheduler scheduler, final int maxRequests,
+            final Duration maxWaitTime) {
+        return new QueueMiddleware(scheduler, maxRequests, maxWaitTime);
+    }
+
+    public static QueueRequestMiddleware of(final int maxRequests, final Duration maxWaitTime) {
+        return new QueueMiddleware(maxRequests, maxWaitTime);
+    }
+}