Use static String variable in Readiness/OpenShiftReadiness

fabric8io · Feb 17, 2021 · 4d40a2c · 4d40a2c
1 parent 8b9d3f4
commit 4d40a2c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/...netes-client/src/main/java/io/fabric8/kubernetes/client/internal/readiness/Readiness.java b/...netes-client/src/main/java/io/fabric8/kubernetes/client/internal/readiness/Readiness.java
@@ -38,8 +38,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
 
 public class Readiness {
@@ -48,6 +46,7 @@ public class Readiness {
   private static final String NODE_READY = "Ready";
   private static final String TRUE = "True";
   private static final Logger logger = LoggerFactory.getLogger(Readiness.class);
+  private static final String READINESS_APPLICABLE_RESOURCES = "Node, Deployment, ReplicaSet, StatefulSet, Pod, ReplicationController";
 
   public static boolean isReadinessApplicable(Class<? extends HasMetadata> itemClass) {
     return Deployment.class.isAssignableFrom(itemClass)
@@ -65,28 +64,19 @@ public static boolean isReady(HasMetadata item) {
     if (isReadiableKubernetesResource(item)) {
       return isKubernetesResourceReady(item);
     } else {
-      return handleNonReadinessApplicableResource(item, getReadinessApplicableResourcesList());
+      return handleNonReadinessApplicableResource(item, getReadinessApplicableResources());
     }
   }
 
-  public static boolean handleNonReadinessApplicableResource(HasMetadata item, List<String> readinessApplicableResources) {
+  public static boolean handleNonReadinessApplicableResource(HasMetadata item, String readinessApplicableResourcesStr) {
     boolean doesItemExist = Objects.nonNull(item);
-    String readinessApplicableResourcesStr = String.join(",", readinessApplicableResources);
     logger.warn("{} is not a Readiableresource. It needs to be one of [{}]",
       doesItemExist ? item.getKind() : "Unknown", readinessApplicableResourcesStr);
     return doesItemExist;
   }
 
-  public static List<String> getReadinessApplicableResourcesList() {
-    List<String> readinessApplicableResources = new ArrayList<>();
-    readinessApplicableResources.add("Node");
-    readinessApplicableResources.add("Deployment");
-    readinessApplicableResources.add("ReplicaSet");
-    readinessApplicableResources.add("StatefulSet");
-    readinessApplicableResources.add("Pod");
-    readinessApplicableResources.add("ReplicationController");
-
-    return readinessApplicableResources;
+  public static String getReadinessApplicableResources() {
+    return READINESS_APPLICABLE_RESOURCES;
   }
 
   private static boolean isKubernetesResourceReady(HasMetadata item) {

diff --git a/...ient/src/main/java/io/fabric8/openshift/client/internal/readiness/OpenShiftReadiness.java b/...ient/src/main/java/io/fabric8/openshift/client/internal/readiness/OpenShiftReadiness.java
@@ -22,10 +22,8 @@
 import io.fabric8.openshift.api.model.DeploymentConfigSpec;
 import io.fabric8.openshift.api.model.DeploymentConfigStatus;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class OpenShiftReadiness extends Readiness {
+  private static final String OPENSHIFT_READINESS_APPLICABLE_RESOURCES = "DeploymentConfig";
   public static boolean isReadinessApplicable(Class<? extends HasMetadata> itemClass) {
     return Readiness.isReadinessApplicable(itemClass)
       || DeploymentConfig.class.isAssignableFrom(itemClass)
@@ -38,7 +36,7 @@ public static boolean isReady(HasMetadata item) {
     } else if (item instanceof DeploymentConfig) {
       return isDeploymentConfigReady((DeploymentConfig) item);
     } else {
-      return handleNonReadinessApplicableResource(item, getOpenShiftReadinessApplicableResourcesList());
+      return handleNonReadinessApplicableResource(item, getOpenShiftReadinessApplicableResources());
     }
   }
 
@@ -60,10 +58,7 @@ public static boolean isDeploymentConfigReady(DeploymentConfig d) {
       spec.getReplicas() <= status.getAvailableReplicas();
   }
 
-  private static List<String> getOpenShiftReadinessApplicableResourcesList() {
-    List<String> openShiftReadinessApplicableResources = new ArrayList<>(Readiness.getReadinessApplicableResourcesList());
-    openShiftReadinessApplicableResources.add("DeploymentConfig");
-
-    return openShiftReadinessApplicableResources;
+  private static String getOpenShiftReadinessApplicableResources() {
+    return Readiness.getReadinessApplicableResources() + ", " + OPENSHIFT_READINESS_APPLICABLE_RESOURCES;
   }
 }