Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Udpate cf-java client to 3.8.0.RELEASE

Browse Source
This commit is contained in:
Kris De Volder
2018-04-05 12:07:59 -07:00
parent b684bf0d20
commit 23df3f3ae4
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/ReactorUtils.java
View File

@@ -163,21 +163,21 @@ public class ReactorUtils {
return Flux.merge(
operations
.map((Mono<Void> op) -> {
return op.otherwise((e) -> {
return op.onErrorResume((e) -> {
failure.compareAndSet(null, e);
return Mono.empty();
});
}),
concurrency //limit concurrency otherwise troubles (flooding/choking request broker?)
)
.then(() -> {
.then(Mono.defer(() -> {
Throwable error = failure.get();
if (error!=null) {
return Mono.error(error);
} else {
return Mono.empty();
}
});
}));
}
/**
@@ -280,6 +280,10 @@ public class ReactorUtils {
* Connect a mono to a CompletableFuture so that the result of the mono
* can be retrieved from the {@link CompletableFuture} by calling it's 'get'
* method.
*
* WARNING: this method looks like it has a bug and doesn't complete the
* future for a Mono.empty() case (i.e. a Mono that terminates without either
* a onNext or a onComplete call.
*/
public static <T> void completeWith(CompletableFuture<T> future, Mono<T> mono) {
mono.doOnNext((T v) -> {

6
headless-services/commons/pom.xml
View File

@@ -81,9 +81,9 @@
<jersey-2-version>2.10</jersey-2-version>
<lsp4j-version>0.4.0-SNAPSHOT</lsp4j-version>
<!-- NOTE: Reactor version must match version used by the CF client -->
<reactor-version>3.1.5.RELEASE</reactor-version>
<reactor-netty>0.6.0.RELEASE</reactor-netty>
<cloudfoundry-client-version>2.4.0.RELEASE</cloudfoundry-client-version>
<cloudfoundry-client-version>3.8.0.RELEASE</cloudfoundry-client-version>
<reactor-version>3.1.5.RELEASE</reactor-version>
<reactor-netty>0.7.5.RELEASE</reactor-netty>
<commons-io-version>2.4</commons-io-version>
</properties>

2
vscode-extensions/vscode-manifest-yaml/package.json
View File

@@ -58,7 +58,7 @@
"vsce-package": "vsce package"
},
"dependencies": {
"@pivotal-tools/commons-vscode": "^0.2.0",
"@pivotal-tools/commons-vscode": "file:../commons-vscode/pivotal-tools-commons-vscode-0.2.1.tgz",
"vscode-languageclient": "^4.0.0"
},
"devDependencies": {