Merge branch '3.x'

Author: twoseat

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/ConnectionContext.java

@@ -38,6 +38,11 @@ public interface ConnectionContext {
      */
     HttpClient getHttpClient();
 
+    /**
+     * The number of retries after an unsuccessful request
+     */
+    Long getInvalidTokenRetries();
+
     /**
      * The {@link ObjectMapper} to use
      */

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/_DefaultConnectionContext.java

@@ -107,6 +107,12 @@ public HttpClient getHttpClient() {
             .secure(this::configureSsl);
     }
 
+    @Override
+    @Value.Default
+    public Long getInvalidTokenRetries() {
+        return 5L;
+    }
+
     @Override
     @Value.Default
     public ObjectMapper getObjectMapper() {

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/Operator.java

@@ -206,7 +206,8 @@ private Flux<HttpClientResponseWithBody> invalidateToken(Flux<HttpClientResponse
         private Flux<HttpClientResponseWithBody> processResponse(Flux<HttpClientResponseWithBody> inbound) {
             return inbound
                 .transform(this::invalidateToken)
-                .retry(t -> t instanceof InvalidTokenException)
+                .retry(this.context.getConnectionContext().getInvalidTokenRetries(),
+                    t -> t instanceof InvalidTokenException)
                 .transform(this.context.getErrorPayloadMapper()
                     .orElse(ErrorPayloadMappers.fallback()));
         }