get stored secrets and configmaps from packet without dependency on c… (#2500)

* get stored secrets and configmaps from packet without dependency on continue flag

* Inline change and add behavior change to Test support for unit tests that verify fix

Author: lennyphan

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

@@ -17,7 +17,6 @@
 import oracle.kubernetes.operator.DomainStatusUpdater;
 import oracle.kubernetes.operator.MakeRightDomainOperation;
 import oracle.kubernetes.operator.ProcessingConstants;
-import oracle.kubernetes.operator.calls.AsyncRequestStep;
 import oracle.kubernetes.operator.calls.CallResponse;
 import oracle.kubernetes.operator.helpers.EventHelper.EventData;
 import oracle.kubernetes.operator.helpers.EventHelper.EventItem;
@@ -80,12 +79,7 @@ public NextAction onSuccess(Packet packet, CallResponse<V1SecretList> callRespon
     }
 
     static List<V1Secret> getSecrets(Packet packet) {
-      return Optional.ofNullable(getSecretsIfContinue(packet)).orElse(new ArrayList<>());
-    }
-
-    @SuppressWarnings("unchecked")
-    private static List<V1Secret> getSecretsIfContinue(Packet packet) {
-      return packet.get(AsyncRequestStep.CONTINUE) != null ? (List<V1Secret>) packet.get(SECRETS) : null;
+      return (List<V1Secret>) Optional.ofNullable(packet.get(SECRETS)).orElse(new ArrayList<>());
     }
   }
 
@@ -105,12 +99,7 @@ public NextAction onSuccess(Packet packet, CallResponse<V1ConfigMapList> callRes
     }
 
     static List<V1ConfigMap> getConfigMaps(Packet packet) {
-      return Optional.ofNullable(getConfigMapsIfContinue(packet)).orElse(new ArrayList<>());
-    }
-
-    @SuppressWarnings("unchecked")
-    private static List<V1ConfigMap> getConfigMapsIfContinue(Packet packet) {
-      return packet.get(AsyncRequestStep.CONTINUE) != null ? (List<V1ConfigMap>) packet.get(CONFIGMAPS) : null;
+      return (List<V1ConfigMap>) Optional.ofNullable(packet.get(CONFIGMAPS)).orElse(new ArrayList<>());
     }
   }
 

operator/src/test/java/oracle/kubernetes/operator/helpers/KubernetesTestSupport.java

@@ -86,6 +86,7 @@
 import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 import static java.net.HttpURLConnection.HTTP_OK;
 import static java.net.HttpURLConnection.HTTP_UNAVAILABLE;
+import static oracle.kubernetes.operator.calls.AsyncRequestStep.CONTINUE;
 import static oracle.kubernetes.operator.calls.AsyncRequestStep.RESPONSE_COMPONENT_NAME;
 
 @SuppressWarnings("WeakerAccess")
@@ -1205,6 +1206,8 @@ public NextAction apply(Packet packet) {
         Object callResult = callContext.execute();
         CallResponse<Object> callResponse = createResponse(callResult);
         packet.getComponents().put(RESPONSE_COMPONENT_NAME, Component.createFor(callResponse));
+        // clear out earlier results.  Replicating the behavior as in AsyncRequestStep.apply()
+        packet.remove(CONTINUE);
       } catch (NotFoundException e) {
         packet.getComponents().put(RESPONSE_COMPONENT_NAME, Component.createFor(createResponse(e)));
       } catch (HttpErrorException e) {