From 7e6da163c4d1d0bd93ec78dbe48f3ceb50d46a4f Mon Sep 17 00:00:00 2001 From: maggieneterval Date: Thu, 17 Oct 2019 17:27:21 -0400 Subject: [PATCH] refactor(kubernetes): remove unnecessary casts to credentials classes --- .../KubernetesKindAtomicOperationDescription.groovy | 3 ++- .../artifact/KubernetesCleanupArtifactsDescription.java | 4 +++- .../description/job/KubernetesRunJobOperationDescription.java | 4 +++- .../manifest/KubernetesDeployManifestDescription.java | 4 +++- .../manifest/KubernetesMultiManifestOperationDescription.java | 3 ++- .../manifest/KubernetesPatchManifestDescription.java | 4 +++- .../KubernetesServerGroupOperationDescription.java | 3 ++- .../v2/op/artifact/KubernetesCleanupArtifactsOperation.java | 2 +- .../AbstractKubernetesEnableDisableManifestOperation.java | 2 +- .../v2/op/manifest/KubernetesDeleteManifestOperation.java | 2 +- .../v2/op/manifest/KubernetesDeployManifestOperation.java | 2 +- .../v2/op/manifest/KubernetesPatchManifestOperation.java | 2 +- .../op/manifest/KubernetesPauseRolloutManifestOperation.java | 2 +- .../op/manifest/KubernetesResumeRolloutManifestOperation.java | 2 +- .../v2/op/manifest/KubernetesScaleManifestOperation.java | 2 +- .../op/manifest/KubernetesUndoRolloutManifestOperation.java | 2 +- .../op/servergroup/KubernetesResizeServerGroupOperation.java | 2 +- 17 files changed, 28 insertions(+), 17 deletions(-) diff --git a/clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/description/KubernetesKindAtomicOperationDescription.groovy b/clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/description/KubernetesKindAtomicOperationDescription.groovy index d870075ba1d..99f40bb4cbd 100644 --- a/clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/description/KubernetesKindAtomicOperationDescription.groovy +++ b/clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/description/KubernetesKindAtomicOperationDescription.groovy @@ -17,13 +17,14 @@ package com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.description import com.netflix.spinnaker.clouddriver.kubernetes.description.KubernetesAtomicOperationDescription +import com.netflix.spinnaker.clouddriver.kubernetes.v1.security.KubernetesV1Credentials import groovy.transform.AutoClone import groovy.transform.Canonical // Pair of credentials name and associated kubernetes client @AutoClone @Canonical -class KubernetesKindAtomicOperationDescription extends KubernetesAtomicOperationDescription { +class KubernetesKindAtomicOperationDescription extends KubernetesAtomicOperationDescription { String kind String apiVersion } diff --git a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/artifact/KubernetesCleanupArtifactsDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/artifact/KubernetesCleanupArtifactsDescription.java index 8d660bf29bc..2e9da1f7263 100644 --- a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/artifact/KubernetesCleanupArtifactsDescription.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/artifact/KubernetesCleanupArtifactsDescription.java @@ -19,6 +19,7 @@ import com.netflix.spinnaker.clouddriver.kubernetes.description.KubernetesAtomicOperationDescription; import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesManifest; +import com.netflix.spinnaker.clouddriver.kubernetes.v2.security.KubernetesV2Credentials; import java.util.HashSet; import java.util.Set; import lombok.AllArgsConstructor; @@ -30,6 +31,7 @@ @AllArgsConstructor @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class KubernetesCleanupArtifactsDescription extends KubernetesAtomicOperationDescription { +public class KubernetesCleanupArtifactsDescription + extends KubernetesAtomicOperationDescription { Set manifests = new HashSet<>(); } diff --git a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/job/KubernetesRunJobOperationDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/job/KubernetesRunJobOperationDescription.java index ef8eaec59b8..96624eee991 100644 --- a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/job/KubernetesRunJobOperationDescription.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/job/KubernetesRunJobOperationDescription.java @@ -18,6 +18,7 @@ import com.netflix.spinnaker.clouddriver.kubernetes.description.KubernetesAtomicOperationDescription; import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesManifest; +import com.netflix.spinnaker.clouddriver.kubernetes.v2.security.KubernetesV2Credentials; import com.netflix.spinnaker.kork.artifacts.model.Artifact; import java.util.List; import lombok.Data; @@ -25,7 +26,8 @@ @Data @EqualsAndHashCode(callSuper = true) -public class KubernetesRunJobOperationDescription extends KubernetesAtomicOperationDescription { +public class KubernetesRunJobOperationDescription + extends KubernetesAtomicOperationDescription { String application; String namespace = ""; KubernetesManifest manifest; diff --git a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesDeployManifestDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesDeployManifestDescription.java index 8c297140bb1..55036f94987 100644 --- a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesDeployManifestDescription.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesDeployManifestDescription.java @@ -18,6 +18,7 @@ package com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest; import com.netflix.spinnaker.clouddriver.kubernetes.description.KubernetesAtomicOperationDescription; +import com.netflix.spinnaker.clouddriver.kubernetes.v2.security.KubernetesV2Credentials; import com.netflix.spinnaker.kork.artifacts.model.Artifact; import com.netflix.spinnaker.moniker.Moniker; import java.util.List; @@ -26,7 +27,8 @@ @Data @EqualsAndHashCode(callSuper = true) -public class KubernetesDeployManifestDescription extends KubernetesAtomicOperationDescription { +public class KubernetesDeployManifestDescription + extends KubernetesAtomicOperationDescription { @Deprecated private KubernetesManifest manifest; private List manifests; private Moniker moniker; diff --git a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesMultiManifestOperationDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesMultiManifestOperationDescription.java index c015d7d0016..de6652aa9c8 100644 --- a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesMultiManifestOperationDescription.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesMultiManifestOperationDescription.java @@ -21,6 +21,7 @@ import com.netflix.spinnaker.clouddriver.kubernetes.description.KubernetesAtomicOperationDescription; import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesCoordinates; import com.netflix.spinnaker.clouddriver.kubernetes.v2.security.KubernetesSelectorList; +import com.netflix.spinnaker.clouddriver.kubernetes.v2.security.KubernetesV2Credentials; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -32,7 +33,7 @@ @EqualsAndHashCode(callSuper = true) @Data public class KubernetesMultiManifestOperationDescription - extends KubernetesAtomicOperationDescription { + extends KubernetesAtomicOperationDescription { private String manifestName; private String location; private List kinds = new ArrayList<>(); diff --git a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesPatchManifestDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesPatchManifestDescription.java index d59e8414a9b..4dfb1b00b41 100644 --- a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesPatchManifestDescription.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesPatchManifestDescription.java @@ -20,6 +20,7 @@ import com.netflix.spinnaker.clouddriver.kubernetes.description.KubernetesAtomicOperationDescription; import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesCoordinates; import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesPatchOptions; +import com.netflix.spinnaker.clouddriver.kubernetes.v2.security.KubernetesV2Credentials; import com.netflix.spinnaker.kork.artifacts.model.Artifact; import java.util.List; import lombok.Data; @@ -28,7 +29,8 @@ @Data @EqualsAndHashCode(callSuper = true) -public class KubernetesPatchManifestDescription extends KubernetesAtomicOperationDescription { +public class KubernetesPatchManifestDescription + extends KubernetesAtomicOperationDescription { private String manifestName; private String location; diff --git a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/servergroup/KubernetesServerGroupOperationDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/servergroup/KubernetesServerGroupOperationDescription.java index 110f6a13f17..ba6765f3a53 100644 --- a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/servergroup/KubernetesServerGroupOperationDescription.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/servergroup/KubernetesServerGroupOperationDescription.java @@ -22,6 +22,7 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesCoordinates; import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKind; import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesManifest; +import com.netflix.spinnaker.clouddriver.kubernetes.v2.security.KubernetesV2Credentials; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.tuple.Pair; @@ -29,7 +30,7 @@ @EqualsAndHashCode(callSuper = true) @Data public class KubernetesServerGroupOperationDescription - extends KubernetesAtomicOperationDescription { + extends KubernetesAtomicOperationDescription { private String serverGroupName; private String region; // :( diff --git a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/artifact/KubernetesCleanupArtifactsOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/artifact/KubernetesCleanupArtifactsOperation.java index fda15949d27..7eddd1abd7d 100644 --- a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/artifact/KubernetesCleanupArtifactsOperation.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/artifact/KubernetesCleanupArtifactsOperation.java @@ -51,7 +51,7 @@ public class KubernetesCleanupArtifactsOperation implements AtomicOperation patchResource( protected AbstractKubernetesEnableDisableManifestOperation( KubernetesEnableDisableManifestDescription description) { this.description = description; - this.credentials = (KubernetesV2Credentials) description.getCredentials().getCredentials(); + this.credentials = description.getCredentials().getCredentials(); } private static Task getTask() { diff --git a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeleteManifestOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeleteManifestOperation.java index 4eb239ad71f..e72d8951dd1 100644 --- a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeleteManifestOperation.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeleteManifestOperation.java @@ -37,7 +37,7 @@ public class KubernetesDeleteManifestOperation implements AtomicOperation { public KubernetesScaleManifestOperation(KubernetesScaleManifestDescription description) { this.description = description; - this.credentials = (KubernetesV2Credentials) description.getCredentials().getCredentials(); + this.credentials = description.getCredentials().getCredentials(); } private static Task getTask() { diff --git a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesUndoRolloutManifestOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesUndoRolloutManifestOperation.java index e267d346700..032bdd25b14 100644 --- a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesUndoRolloutManifestOperation.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesUndoRolloutManifestOperation.java @@ -36,7 +36,7 @@ public class KubernetesUndoRolloutManifestOperation implements AtomicOperation