Merge branch '3.x' into main

twoseat · twoseat · commit b9b6383e8caf · 2020-07-31T13:31:13.000+01:00
diff --git a/cloudfoundry-util/src/main/java/org/cloudfoundry/util/DelayUtils.java b/cloudfoundry-util/src/main/java/org/cloudfoundry/util/DelayUtils.java
@@ -98,7 +98,7 @@ private static Duration calculateDuration(Duration minimum, Duration maximum, Lo
     private static Flux<?> getDelay(Duration minimum, Duration maximum, Instant finish, Flux<Long> iterations) {
         return iterations
             .map(iteration -> calculateDuration(minimum, maximum, iteration))
-            .flatMap(delay -> {
+            .concatMap(delay -> {
                 if (Instant.now().isAfter(finish)) {
                     return Mono.error(new DelayTimeoutException());
                 }
diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,7 @@
 
     <properties>
         <commons-compress.version>1.20</commons-compress.version>
-        <dependencies.version>2.2.7.RELEASE</dependencies.version>
+        <dependencies.version>2.2.9.RELEASE</dependencies.version>
         <evo-inflector.version>1.2.2</evo-inflector.version>
         <immutables.version>2.8.8</immutables.version>
         <java-semver.version>0.9.0</java-semver.version>

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ private static Duration calculateDuration(Duration minimum, Duration maximum, Lo`
`98`	`98`	`private static Flux<?> getDelay(Duration minimum, Duration maximum, Instant finish, Flux<Long> iterations) {`
`99`	`99`	`return iterations`
`100`	`100`	`.map(iteration -> calculateDuration(minimum, maximum, iteration))`
`101`		`- .flatMap(delay -> {`
	`101`	`+ .concatMap(delay -> {`
`102`	`102`	`if (Instant.now().isAfter(finish)) {`
`103`	`103`	`return Mono.error(new DelayTimeoutException());`
`104`	`104`	`}`