diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/DomainValidationSteps.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/DomainValidationSteps.java index fc02dab3667..e3948f6c924 100644 --- a/operator/src/main/java/oracle/kubernetes/operator/helpers/DomainValidationSteps.java +++ b/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 callRespon } static List getSecrets(Packet packet) { - return Optional.ofNullable(getSecretsIfContinue(packet)).orElse(new ArrayList<>()); - } - - @SuppressWarnings("unchecked") - private static List getSecretsIfContinue(Packet packet) { - return packet.get(AsyncRequestStep.CONTINUE) != null ? (List) packet.get(SECRETS) : null; + return (List) Optional.ofNullable(packet.get(SECRETS)).orElse(new ArrayList<>()); } } @@ -105,12 +99,7 @@ public NextAction onSuccess(Packet packet, CallResponse callRes } static List getConfigMaps(Packet packet) { - return Optional.ofNullable(getConfigMapsIfContinue(packet)).orElse(new ArrayList<>()); - } - - @SuppressWarnings("unchecked") - private static List getConfigMapsIfContinue(Packet packet) { - return packet.get(AsyncRequestStep.CONTINUE) != null ? (List) packet.get(CONFIGMAPS) : null; + return (List) Optional.ofNullable(packet.get(CONFIGMAPS)).orElse(new ArrayList<>()); } } diff --git a/operator/src/test/java/oracle/kubernetes/operator/helpers/KubernetesTestSupport.java b/operator/src/test/java/oracle/kubernetes/operator/helpers/KubernetesTestSupport.java index 149ea0ed31c..8bc3fd3f1f5 100644 --- a/operator/src/test/java/oracle/kubernetes/operator/helpers/KubernetesTestSupport.java +++ b/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 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) {