Merge branch '3.x' into main

twoseat · twoseat · commit 2ab80dd7bd21 · 2020-09-16T10:13:42.000+01:00
diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/uaa/UsernameProvider.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/uaa/UsernameProvider.java
@@ -50,8 +50,8 @@ final class UsernameProvider {
 
     Mono<String> get() {
         return getToken(this.connectionContext, this.tokenProvider)
+            .publishOn(Schedulers.elastic())
             .map(this::getUsername)
-            .subscribeOn(Schedulers.elastic())
             .retryWhen(Retry.max(1).filter(ExpiredJwtException.class::isInstance)
                 .doAfterRetry(r -> this.tokenProvider.invalidate(this.connectionContext)));
     }

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ final class UsernameProvider {`
`50`	`50`
`51`	`51`	`Mono<String> get() {`
`52`	`52`	`return getToken(this.connectionContext, this.tokenProvider)`
	`53`	`+ .publishOn(Schedulers.elastic())`
`53`	`54`	`.map(this::getUsername)`
`54`		`- .subscribeOn(Schedulers.elastic())`
`55`	`55`	`.retryWhen(Retry.max(1).filter(ExpiredJwtException.class::isInstance)`
`56`	`56`	`.doAfterRetry(r -> this.tokenProvider.invalidate(this.connectionContext)));`
`57`	`57`	`}`