Minor cleanup related changes.

Author: ankedia

operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java

@@ -1382,10 +1382,15 @@ private void invoke() {
                                     info, waiting.getReason(), waiting.getMessage(), null)));
           break;
         case INIT_CONTAINERS_NOT_READY:
-          List<String> waitingMessages = new ArrayList<>();
           List<String> waitingReasons = new ArrayList<>();
+          List<String> waitingMessages = new ArrayList<>();
 
-          getInitContainersWaitingReasonsAndMessages(introspectorPod, waitingReasons, waitingMessages);
+          Optional.ofNullable(getInitContainerStatuses(introspectorPod))
+                  .orElseGet(Collections::emptyList).stream()
+                  .forEach(status -> {
+                    waitingMessages.add(getWaitingMessageFromStatus(status));
+                    waitingReasons.add(getWaitingReason(status));
+                  });
           if (!waitingReasons.isEmpty()) {
             delegate.runSteps(DomainStatusUpdater.createFailureRelatedSteps(
                     info, onSeparateLines(waitingReasons), onSeparateLines(waitingMessages), null));
@@ -1419,14 +1424,6 @@ private void invoke() {
       }
     }
 
-    private void getInitContainersWaitingReasonsAndMessages(V1Pod pod, List waitingReasons, List waitingMessages) {
-      Optional.ofNullable(getInitContainerStatuses(pod)).orElseGet(Collections::emptyList).stream()
-              .forEach(status -> {
-                waitingMessages.add(getWaitingMessageFromStatus(status));
-                waitingReasons.add(getWaitingReason(status));
-              });
-    }
-
     private String getWaitingReason(V1ContainerStatus status) {
       return Optional.ofNullable(status)
               .map(V1ContainerStatus::getState)

operator/src/main/java/oracle/kubernetes/operator/PodWatcher.java

@@ -265,9 +265,9 @@ private static String getReason(V1PodCondition podCondition) {
     return Optional.ofNullable(podCondition).map(V1PodCondition::getReason).orElse("");
   }
 
-  private static boolean notReady(List<V1ContainerStatus> initContainerStatus) {
-    return Optional.ofNullable(initContainerStatus)
-            .orElseGet(Collections::emptyList).stream().anyMatch(statuses -> notReady(statuses));
+  private static boolean notReady(List<V1ContainerStatus> initContainerStatuses) {
+    return Optional.ofNullable(initContainerStatuses)
+            .orElseGet(Collections::emptyList).stream().anyMatch(status -> notReady(status));
   }
 
   private static boolean notReady(V1ContainerStatus conStatus) {

operator/src/main/java/oracle/kubernetes/operator/helpers/JobHelper.java

@@ -568,9 +568,8 @@ private void recordJobPodNameAndStatus(Packet packet, V1Pod pod) {
                   .map(V1PodStatus::getContainerStatuses).map(statuses -> statuses.get(0))
                   .map(V1ContainerStatus::getState).map(V1ContainerState::getWaiting)
                   .map(V1ContainerStateWaiting::getReason).orElse(null));
+          packet.put(ProcessingConstants.JOB_POD_INIT_CONTAINER_WAITING_REASON, getInitContainerWaitingMessages(pod));
         }
-
-        packet.put(ProcessingConstants.JOB_POD_INIT_CONTAINER_WAITING_REASON, getInitContainerWaitingMessages(pod));
       }
 
       private Boolean getInitContainerWaitingMessages(V1Pod pod) {
@@ -624,12 +623,8 @@ static OffsetDateTime createNextSteps(List<Step> nextSteps, Packet packet, V1Job
     }
 
     private static Boolean getjobInitContainerImagePullError(Packet packet) {
-      Boolean containerWaitingReason = packet.getValue(ProcessingConstants.JOB_POD_INIT_CONTAINER_WAITING_REASON);
-      return Optional.ofNullable(containerWaitingReason).orElse(Boolean.FALSE);
-    }
-
-    private static Boolean isNotNull(Boolean jobInitContainerImagePullError) {
-      return Optional.ofNullable(jobInitContainerImagePullError).orElse(false);
+      return Optional.ofNullable(packet.<Boolean>getValue(ProcessingConstants.JOB_POD_INIT_CONTAINER_WAITING_REASON))
+              .orElse(Boolean.FALSE);
     }
   }