From 8f1308d1816948f164a81bc900808916f1fa7773 Mon Sep 17 00:00:00 2001 From: Jammy Louie Date: Fri, 8 Nov 2019 14:49:28 -0500 Subject: [PATCH] refactor(cf): removed unused code, fix spelling and etc (#4159) --- .../clouddriver/cloudfoundry/cache/Keys.java | 22 ++++++++++-- .../cloudfoundry/client/Applications.java | 35 +++++++++++-------- .../client/CloudFoundryApiException.java | 21 +++++++---- .../client/CloudFoundryClientUtils.java | 2 +- .../client/HttpCloudFoundryClient.java | 5 ++- ...loudFoundryServerGroupAtomicOperation.java | 14 ++++---- 6 files changed, 62 insertions(+), 37 deletions(-) diff --git a/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/cache/Keys.java b/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/cache/Keys.java index 0e710a584a7..74d63d67b9f 100644 --- a/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/cache/Keys.java +++ b/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/cache/Keys.java @@ -75,7 +75,7 @@ public static Optional> parse(String key) { } public static String getApplicationKey(String app) { - return ID + ":" + Namespace.APPLICATIONS + ":" + app; + return ID + ":" + Namespace.APPLICATIONS + ":" + app.toLowerCase(); } public static String getAllLoadBalancers() { @@ -132,11 +132,27 @@ public static String getLoadBalancerKey(String account, String uri, String regio } public static String getClusterKey(String account, String app, String name) { - return ID + ":" + Namespace.CLUSTERS + ":" + account + ":" + app + ":" + name; + return ID + + ":" + + Namespace.CLUSTERS + + ":" + + account + + ":" + + app.toLowerCase() + + ":" + + name.toLowerCase(); } public static String getServerGroupKey(String account, String name, String region) { - return ID + ":" + Namespace.SERVER_GROUPS + ":" + account + ":" + name + ":" + region; + return ID + + ":" + + Namespace.SERVER_GROUPS + + ":" + + account + + ":" + + name.toLowerCase() + + ":" + + region; } public static String getInstanceKey(String account, String instanceName) { diff --git a/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/Applications.java b/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/Applications.java index a7e18ea24a7..5febb69908d 100644 --- a/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/Applications.java +++ b/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/Applications.java @@ -102,7 +102,9 @@ public List all() { // Evict Records from `cache` that are no longer in the foundation List availableAppIds = newCloudFoundryAppList.stream().map(Application::getGuid).collect(toList()); - serverGroupCache.asMap().keySet().stream() + serverGroupCache + .asMap() + .keySet() .forEach( key -> { if (!availableAppIds.contains(key)) { @@ -168,7 +170,7 @@ public List all() { @Nullable public CloudFoundryServerGroup findServerGroupByNameAndSpaceId(String name, String spaceId) { return Optional.ofNullable(findServerGroupId(name, spaceId)) - .map(serverGroupId -> Optional.ofNullable(findById(serverGroupId)).orElse(null)) + .flatMap(serverGroupId -> Optional.ofNullable(findById(serverGroupId))) .orElse(null); } @@ -214,7 +216,7 @@ private CloudFoundryServerGroup map(Application application) { try { CloudFoundryPackage cfPackage = safelyCall(() -> api.findPackagesByAppId(appId)) - .map( + .flatMap( packages -> packages.getResources().stream() .findFirst() @@ -233,8 +235,7 @@ private CloudFoundryServerGroup map(Application application) { pkg.getData().getChecksum() == null ? null : pkg.getData().getChecksum().getValue()) - .build()) - .orElse(null)) + .build())) .orElse(null); droplet = @@ -304,13 +305,17 @@ private CloudFoundryServerGroup map(Application application) { String serverGroupAppManagerUri = appsManagerUri; if (StringUtils.isNotEmpty(appsManagerUri)) { serverGroupAppManagerUri = - appsManagerUri - + "/organizations/" - + space.getOrganization().getId() - + "/spaces/" - + space.getId() - + "/applications/" - + appId; + Optional.ofNullable(space) + .map( + s -> + appsManagerUri + + "/organizations/" + + s.getOrganization().getId() + + "/spaces/" + + s.getId() + + "/applications/" + + appId) + .orElse(""); } String serverGroupMetricsUri = metricsUri; @@ -504,7 +509,7 @@ public void updateProcess( throws CloudFoundryApiException { final Process.HealthCheck healthCheck = healthCheckType != null ? new Process.HealthCheck().setType(healthCheckType) : null; - if (healthCheckEndpoint != null && !healthCheckEndpoint.isEmpty()) { + if (healthCheckEndpoint != null && !healthCheckEndpoint.isEmpty() && healthCheck != null) { healthCheck.setData(new Process.HealthCheckData().setEndpoint(healthCheckEndpoint)); } safelyCall(() -> api.updateProcess(guid, new UpdateProcess(command, healthCheck))); @@ -539,9 +544,9 @@ public InputStream downloadPackageBits(String packageGuid) throws CloudFoundryAp } } - public String uploadPackageBits(String packageGuid, File file) throws CloudFoundryApiException { + public void uploadPackageBits(String packageGuid, File file) throws CloudFoundryApiException { TypedFile uploadFile = new TypedFile("multipart/form-data", file); - return safelyCall(() -> api.uploadPackageBits(packageGuid, uploadFile)) + safelyCall(() -> api.uploadPackageBits(packageGuid, uploadFile)) .map(Package::getGuid) .orElseThrow( () -> diff --git a/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/CloudFoundryApiException.java b/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/CloudFoundryApiException.java index 87e06917fa6..961ed6135c6 100644 --- a/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/CloudFoundryApiException.java +++ b/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/CloudFoundryApiException.java @@ -36,18 +36,16 @@ public CloudFoundryApiException(ErrorDescription errorCause, RetrofitError retro super( Optional.ofNullable(errorCause) .map(e -> getMessage(e.getErrors().toArray(new String[0]))) - .orElse( - "status: " - + retrofitError.getResponse().getStatus() - + ". url: " - + retrofitError.getResponse().getUrl() - + ". raw response body: " - + retrofitError.getResponse().getBody())); + .orElse(getRetrofitErrorMessage(retrofitError))); if (errorCause != null) { this.errorCode = errorCause.getCode(); } } + public CloudFoundryApiException(RetrofitError retrofitError) { + super(getRetrofitErrorMessage(retrofitError)); + } + public CloudFoundryApiException(Throwable t, String... errors) { super(getMessage(t, errors), t); } @@ -66,4 +64,13 @@ private static String getMessage(Throwable t, String... errors) { allErrors[errors.length] = t.getMessage(); return getMessage(allErrors); } + + private static String getRetrofitErrorMessage(RetrofitError retrofitError) { + return "status: " + + retrofitError.getResponse().getStatus() + + ". url: " + + retrofitError.getResponse().getUrl() + + ". raw response body: " + + retrofitError.getResponse().getBody(); + } } diff --git a/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/CloudFoundryClientUtils.java b/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/CloudFoundryClientUtils.java index 4252e5b3be6..5e0af119c6f 100644 --- a/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/CloudFoundryClientUtils.java +++ b/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/CloudFoundryClientUtils.java @@ -50,7 +50,7 @@ static Optional safelyCall(RetrofitCallable r) throws CloudFoundryApiE ErrorDescription errorDescription = (ErrorDescription) retrofitError.getBodyAs(ErrorDescription.class); if (errorDescription == null) { - throw new CloudFoundryApiException(retrofitError.getCause()); + throw new CloudFoundryApiException(retrofitError); } throw new CloudFoundryApiException(errorDescription, retrofitError); } diff --git a/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/HttpCloudFoundryClient.java b/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/HttpCloudFoundryClient.java index 6d7da3efdd9..653c3461f80 100644 --- a/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/HttpCloudFoundryClient.java +++ b/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/HttpCloudFoundryClient.java @@ -74,6 +74,7 @@ public class HttpCloudFoundryClient implements CloudFoundryClient { private final String user; private final String password; private final OkHttpClient okHttpClient; + private Logger logger = LoggerFactory.getLogger(HttpCloudFoundryClient.class); private AuthenticationService uaaService; private AtomicLong tokenExpirationNs = new AtomicLong(System.nanoTime()); @@ -91,8 +92,6 @@ public class HttpCloudFoundryClient implements CloudFoundryClient { private Tasks tasks; private Logs logs; - Logger logger = LoggerFactory.getLogger(HttpCloudFoundryClient.class); - private final RequestInterceptor oauthInterceptor = new RequestInterceptor() { @Override @@ -164,7 +163,7 @@ Response createRetryInterceptor(Interceptor.Chain chain) { }); } catch (SocketTimeoutException e) { throw new RetryableApiException( - "Timeout " + callName + " " + chain.request().httpUrl() + ", attempting retrying", e); + "Timeout " + callName + " " + chain.request().httpUrl() + ", attempting retry", e); } catch (Exception e) { final Response response = lastResponse.get(); if (response == null) { diff --git a/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServerGroupAtomicOperation.java b/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServerGroupAtomicOperation.java index a782a0359f4..4be0930474c 100644 --- a/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServerGroupAtomicOperation.java +++ b/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServerGroupAtomicOperation.java @@ -111,7 +111,7 @@ public DeploymentResult operate(List priorOutputs) { return deploymentResult(); } - final Integer desiredInstanceCount = description.getApplicationAttributes().getInstances(); + final int desiredInstanceCount = description.getApplicationAttributes().getInstances(); if (description.isStartApplication() && desiredInstanceCount > 0) { client.getApplications().startApplication(serverGroup.getId()); ProcessStats.State state = @@ -285,13 +285,11 @@ private static ExternalReference resolveArtifactInfo( private static ExternalReference resolveBuildInfo( DeployCloudFoundryServerGroupDescription description) { Map buildInfo = null; - if (buildInfo == null) { - final Artifact applicationArtifact = description.getApplicationArtifact(); - if (applicationArtifact != null) { - final Map metadata = applicationArtifact.getMetadata(); - if (metadata != null) { - buildInfo = (Map) applicationArtifact.getMetadata().get("build"); - } + final Artifact applicationArtifact = description.getApplicationArtifact(); + if (applicationArtifact != null) { + final Map metadata = applicationArtifact.getMetadata(); + if (metadata != null) { + buildInfo = (Map) applicationArtifact.getMetadata().get("build"); } } if (buildInfo == null) {