respond to some more review comments

Author: Vince Kraemer

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

@@ -15,6 +15,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
+import javax.validation.constraints.NotNull;
 import oracle.kubernetes.operator.JobWatcher;
 import oracle.kubernetes.operator.LabelConstants;
 import oracle.kubernetes.operator.ProcessingConstants;
@@ -112,21 +113,6 @@ List<V1EnvVar> getConfiguredEnvVars(TuningParameters tuningParameters) {
     }
   }
 
-  /**
-   * Factory for {@link Step} that creates WebLogic domain introspector job
-   *
-   * @param tuning Watch tuning parameters
-   * @param next Next processing step
-   * @return Step for creating job
-   */
-  @Deprecated
-  public static Step createDomainIntrospectorJobStep(WatchTuning tuning, Step next) {
-
-    // return new DomainIntrospectorJobStep(
-    //    readDomainIntrospectorPodLogStep(ConfigMapHelper.createSitConfigMapStep(next)));
-    return new DomainIntrospectorJobStep(tuning, next, null, new AtomicBoolean(false));
-  }
-
   /**
    * Factory for {@link Step} that creates WebLogic domain introspector job
    *
@@ -137,7 +123,10 @@ public static Step createDomainIntrospectorJobStep(WatchTuning tuning, Step next
    * @return Step for creating job
    */
   public static Step createDomainIntrospectorJobStep(
-      WatchTuning tuning, Step next, Map<String, JobWatcher> jws, AtomicBoolean isStopping) {
+      WatchTuning tuning,
+      Step next,
+      @NotNull Map<String, JobWatcher> jws,
+      @NotNull AtomicBoolean isStopping) {
 
     return new DomainIntrospectorJobStep(tuning, next, jws, isStopping);
   }

operator/src/main/java/oracle/kubernetes/operator/steps/WatchDomainIntrospectorJobReadyStep.java

@@ -7,6 +7,7 @@
 import io.kubernetes.client.models.V1Job;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
+import javax.validation.constraints.NotNull;
 import oracle.kubernetes.operator.JobWatcher;
 import oracle.kubernetes.operator.ProcessingConstants;
 import oracle.kubernetes.operator.TuningParameters.WatchTuning;
@@ -22,7 +23,10 @@ public class WatchDomainIntrospectorJobReadyStep extends Step {
   private final AtomicBoolean isStopping;
 
   public WatchDomainIntrospectorJobReadyStep(
-      WatchTuning tuning, Step next, Map<String, JobWatcher> jws, AtomicBoolean isStopping) {
+      WatchTuning tuning,
+      Step next,
+      @NotNull Map<String, JobWatcher> jws,
+      @NotNull AtomicBoolean isStopping) {
     super(next);
     this.tuning = tuning;
     this.jws = jws;
@@ -39,18 +43,16 @@ public NextAction apply(Packet packet) {
 
     // No need to spawn a watcher if the job is already complete
     if (domainIntrospectorJob != null && !JobWatcher.isComplete(domainIntrospectorJob)) {
-      JobWatcher jw = null;
-      if (jws == null || !jws.containsKey(namespace)) {
+      JobWatcher jw = jws.get(namespace);
+      if (jw == null) {
         jw =
             JobWatcher.create(
                 ThreadFactorySingleton.getInstance(),
                 namespace,
                 initialResourceVersion,
                 tuning,
-                isStopping != null ? isStopping : new AtomicBoolean(false));
-        if (jws != null) jws.put(namespace, jw);
-      } else {
-        jw = jws.get(namespace);
+                isStopping);
+        jws.put(namespace, jw);
       }
       NextAction retVal = doNext(jw.waitForReady(domainIntrospectorJob, getNext()), packet);