diff --git a/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/ReactorUtils.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/ReactorUtils.java index aaec46eca..7d20c4145 100644 --- a/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/ReactorUtils.java +++ b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/ReactorUtils.java @@ -23,6 +23,8 @@ import java.util.function.Function; import org.reactivestreams.Publisher; import org.springframework.ide.vscode.commons.cloudfoundry.client.v2.CancelationTokens.CancelationToken; +import org.springframework.ide.vscode.commons.util.ExceptionUtil; +import org.springframework.ide.vscode.commons.util.Log; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -64,7 +66,6 @@ public class ReactorUtils { try { return mono.block(DEFAULT_TIMEOUT); } catch (Exception e) { - dumpStacks(); throw new IOException(e); } } @@ -86,17 +87,15 @@ public class ReactorUtils { // .otherwise(errorFilter(cancelationToken)) .block(timeout); } catch (Exception e) { - dumpStacks(); + Log.log(e); throw new IOException(e); } } - public static List get(Duration t, Mono> m) throws IOException { try { return m.block(t); } catch (Exception e) { - dumpStacks(); throw new IOException(e); } } diff --git a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java index 2fc7329b8..07b6745c4 100644 --- a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java +++ b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java @@ -307,6 +307,10 @@ public class YTypeFactory { } } + public void sealHints() { + hints = ImmutableList.copyOf(hints); + } + private Collection getProviderHints(DynamicSchemaContext dc) throws Exception { if (hintProvider != null) { Callable> withContext = hintProvider.withContext(dc); diff --git a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java index 0f27a07ae..b03db701c 100644 --- a/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java +++ b/headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java @@ -13,10 +13,7 @@ package org.springframework.ide.vscode.manifest.yaml; import java.util.Collection; import java.util.List; import java.util.concurrent.Callable; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.springframework.ide.vscode.commons.cloudfoundry.client.CFServiceInstance; import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CFTarget; import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CFTargetCache; import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.ConnectionException; @@ -33,8 +30,6 @@ public abstract class AbstractCFHintsProvider implements Callable