From c66b6565d022759fd37abaaac1a42045cc19ad3c Mon Sep 17 00:00:00 2001 From: nsingh Date: Mon, 9 Jan 2017 10:27:04 -0800 Subject: [PATCH] Renamed CF client targets --- .../{CFClientTarget.java => CFTarget.java} | 6 ++-- .../{CFClientTargets.java => CFTargets.java} | 14 +++++----- .../cloudfoundry/client/CFClientTest.java | 8 +++--- .../ManifestYamlCFBuildpacksProvider.java | 14 +++++----- .../yaml/ManifestYamlCFServicesProvider.java | 14 +++++----- .../yaml/ManifestYamlLanguageServer.java | 28 +++++++++---------- 6 files changed, 41 insertions(+), 43 deletions(-) rename vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/{CFClientTarget.java => CFTarget.java} (88%) rename vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/{CFClientTargets.java => CFTargets.java} (81%) diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFClientTarget.java b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTarget.java similarity index 88% rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFClientTarget.java rename to vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTarget.java index e8c16c20d..3f41c055e 100644 --- a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFClientTarget.java +++ b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTarget.java @@ -17,7 +17,7 @@ import java.util.logging.Logger; import org.springframework.ide.vscode.commons.cloudfoundry.client.CFBuildpack; import org.springframework.ide.vscode.commons.cloudfoundry.client.v2.ClientRequests; -public class CFClientTarget { +public class CFTarget { private final CFClientParams params; private final ClientRequests requests; @@ -27,9 +27,9 @@ public class CFClientTarget { * Cached information */ private List buildpacks; - private final static Logger logger = Logger.getLogger(CFClientTarget.class.getName()); + private final static Logger logger = Logger.getLogger(CFTarget.class.getName()); - public CFClientTarget(CFClientParams params, ClientRequests requests, String targetName) { + public CFTarget(CFClientParams params, ClientRequests requests, String targetName) { this.params = params; this.requests = requests; this.targetName = targetName; diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFClientTargets.java b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTargets.java similarity index 81% rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFClientTargets.java rename to vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTargets.java index 4947e3ecb..afc445ea3 100644 --- a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFClientTargets.java +++ b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTargets.java @@ -21,24 +21,24 @@ import org.springframework.ide.vscode.commons.cloudfoundry.client.v2.DefaultClou * Creates targets given a client parameters factory and a client factory. * */ -public class CFClientTargets { +public class CFTargets { private final CFClientParamsFactory paramsFactory; private final CloudFoundryClientFactory clientFactory; - public CFClientTargets(CFClientParamsFactory paramsFactory, CloudFoundryClientFactory clientFactory) { + public CFTargets(CFClientParamsFactory paramsFactory, CloudFoundryClientFactory clientFactory) { this.paramsFactory = paramsFactory; this.clientFactory = clientFactory; } - public List getTargets() throws Exception { + public List getTargets() throws Exception { List allParams = paramsFactory.getParams(); - List targets = new ArrayList<>(); + List targets = new ArrayList<>(); if (allParams != null) { for (CFClientParams parameters : allParams) { ClientRequests requests = clientFactory.getClient(parameters); if (requests != null) { - targets.add(new CFClientTarget(parameters, requests, getTargetName(parameters))); + targets.add(new CFTarget(parameters, requests, getTargetName(parameters))); } } } @@ -59,10 +59,10 @@ public class CFClientTargets { } } - public static CFClientTargets createDefaultV2ClientTargets() { + public static CFTargets createDefaultV2Targets() { CFClientParamsFactory paramsFactory = CFClientParamsFactory.INSTANCE; CloudFoundryClientFactory clientFactory = DefaultCloudFoundryClientFactoryV2.INSTANCE; - return new CFClientTargets(paramsFactory, clientFactory); + return new CFTargets(paramsFactory, clientFactory); } } diff --git a/vscode-extensions/commons/commons-cf/src/test/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFClientTest.java b/vscode-extensions/commons/commons-cf/src/test/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFClientTest.java index e97ba8edc..a1a4e1a95 100644 --- a/vscode-extensions/commons/commons-cf/src/test/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFClientTest.java +++ b/vscode-extensions/commons/commons-cf/src/test/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFClientTest.java @@ -17,8 +17,8 @@ import java.util.List; import org.junit.Ignore; import org.junit.Test; import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CFClientParamsFactory; -import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CFClientTarget; -import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CFClientTargets; +import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CFTarget; +import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CFTargets; import org.springframework.ide.vscode.commons.cloudfoundry.client.v2.CloudFoundryClientFactory; import org.springframework.ide.vscode.commons.cloudfoundry.client.v2.DefaultCloudFoundryClientFactoryV2; @@ -31,8 +31,8 @@ public class CFClientTest { CFClientParamsFactory paramsFactory = CFClientParamsFactory.INSTANCE; CloudFoundryClientFactory clientFactory = DefaultCloudFoundryClientFactoryV2.INSTANCE; - CFClientTargets targets = new CFClientTargets(paramsFactory, clientFactory); - CFClientTarget target = targets.getTargets().get(0); + CFTargets targets = new CFTargets(paramsFactory, clientFactory); + CFTarget target = targets.getTargets().get(0); List buildPacks = target.getBuildpacks(); assertTrue(!buildPacks.isEmpty()); diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFBuildpacksProvider.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFBuildpacksProvider.java index 881257a7c..4b113b7a4 100644 --- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFBuildpacksProvider.java +++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFBuildpacksProvider.java @@ -19,17 +19,17 @@ import java.util.logging.Logger; import javax.inject.Provider; import org.springframework.ide.vscode.commons.cloudfoundry.client.CFBuildpack; -import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CFClientTarget; +import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CFTarget; import org.springframework.ide.vscode.commons.yaml.schema.BasicYValueHint; import org.springframework.ide.vscode.commons.yaml.schema.YValueHint; public class ManifestYamlCFBuildpacksProvider implements Provider> { - private final List targets; + private final List targets; private static final Logger logger = Logger.getLogger(ManifestYamlCFBuildpacksProvider.class.getName()); - public ManifestYamlCFBuildpacksProvider(List targets) { + public ManifestYamlCFBuildpacksProvider(List targets) { this.targets = targets; } @@ -39,15 +39,15 @@ public class ManifestYamlCFBuildpacksProvider implements Provider hints = new ArrayList<>(); if (targets != null) { - for (CFClientTarget cfClientTarget : targets) { + for (CFTarget cfTarget : targets) { List buildpacks; try { - buildpacks = cfClientTarget.getBuildpacks(); + buildpacks = cfTarget.getBuildpacks(); if (buildpacks != null) { for (CFBuildpack buildpack : buildpacks) { String name = buildpack.getName(); - String label = getBuildpackLabel(cfClientTarget, buildpack); + String label = getBuildpackLabel(cfTarget, buildpack); YValueHint hint = new BasicYValueHint(name, label); if (!hints.contains(hint)) { hints.add(hint); @@ -62,7 +62,7 @@ public class ManifestYamlCFBuildpacksProvider implements Provider> { - private final List targets; + private final List targets; private static final Logger logger = Logger.getLogger(ManifestYamlCFServicesProvider.class.getName()); - public ManifestYamlCFServicesProvider(List targets) { + public ManifestYamlCFServicesProvider(List targets) { this.targets = targets; } @@ -38,14 +38,14 @@ public class ManifestYamlCFServicesProvider implements Provider hints = new ArrayList<>(); if (targets != null) { - for (CFClientTarget cfClientTarget : targets) { + for (CFTarget cfTarget : targets) { try { - List services = cfClientTarget.getClientRequests().getServices(); + List services = cfTarget.getClientRequests().getServices(); if (services != null) { for (CFServiceInstance service : services) { String name = service.getName(); - String label = getServiceLabel(cfClientTarget, service); + String label = getServiceLabel(cfTarget, service); YValueHint hint = new BasicYValueHint(name, label); if (!hints.contains(hint)) { hints.add(hint); @@ -60,7 +60,7 @@ public class ManifestYamlCFServicesProvider implements Provider> buildPacksProvider = getBuildpacksProvider(cfTargets); Provider> servicesProvider = getServicesProvider(cfTargets); @@ -90,18 +87,19 @@ public class ManifestYamlLanguageServer extends SimpleLanguageServer { documents.onHover(hoverEngine ::getHover); } - private CFClientTargets getCFTargets() { - if (cfClientTargets == null) { - cfClientTargets = CFClientTargets.createDefaultV2ClientTargets(); + private CFTargets getCFTargets() { + // TODO: probably shouldn't be cached as targets can change during a language server session + if (cfTargets == null) { + cfTargets = CFTargets.createDefaultV2Targets(); } - return cfClientTargets; + return cfTargets; } - private Provider> getBuildpacksProvider(CFClientTargets targets) { + private Provider> getBuildpacksProvider(CFTargets targets) { try { if (targets != null) { - List cfTargets = targets.getTargets(); + List cfTargets = targets.getTargets(); if (cfTargets != null && !cfTargets.isEmpty()) {; return new ManifestYamlCFBuildpacksProvider(cfTargets); } @@ -113,11 +111,11 @@ public class ManifestYamlLanguageServer extends SimpleLanguageServer { return NO_PROVIDER; } - private Provider> getServicesProvider(CFClientTargets targets) { + private Provider> getServicesProvider(CFTargets targets) { try { if (targets != null) { - List cfTargets = targets.getTargets(); + List cfTargets = targets.getTargets(); if (cfTargets != null && !cfTargets.isEmpty()) { return new ManifestYamlCFServicesProvider(cfTargets); }