Skip to content

Commit d522d00

Browse files
committed
Directly specify next step following a response rather than use chaining
1 parent 904c65e commit d522d00

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,12 @@ public Result onFailure(Packet packet, KubernetesApiResponse<ClusterResource> ca
129129
}
130130

131131
private Step createRetry() {
132-
return Step.chain(
133-
createClusterResourceRefreshStep(),
134-
new SingleClusterResourceStatusUpdateStep(context.getClusterName()));
132+
return createClusterResourceRefreshStep(new SingleClusterResourceStatusUpdateStep(context.getClusterName()));
135133
}
136134

137-
private Step createClusterResourceRefreshStep() {
135+
private Step createClusterResourceRefreshStep(Step next) {
138136
return RequestBuilder.CLUSTER.get(
139-
context.getNamespace(), context.getClusterResourceName(), new ReadClusterResponseStep());
137+
context.getNamespace(), context.getClusterResourceName(), new ReadClusterResponseStep(next));
140138
}
141139
}
142140

@@ -286,6 +284,11 @@ private Step createReplaceClusterStatusAsyncStep() {
286284
}
287285

288286
private static class ReadClusterResponseStep extends ResponseStep<ClusterResource> {
287+
288+
private ReadClusterResponseStep(Step step) {
289+
super(step);
290+
}
291+
289292
@Override
290293
public Result onSuccess(Packet packet, KubernetesApiResponse<ClusterResource> callResponse) {
291294
if (callResponse.getObject() != null) {

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,12 +362,12 @@ public Result onFailure(Packet packet, HttpResponse<String> response) {
362362
LOGGER.info(MessageKeys.SERVER_SHUTDOWN_REST_FAILURE, serverName, response);
363363
}
364364
removeShutdownRequestRetryCount(packet);
365-
return doNext(Step.chain(createDomainRefreshStep(getDomainPresenceInfo(packet).getDomainName(),
366-
getDomainPresenceInfo(packet).getNamespace()), getNext()), packet);
365+
return doNext(createDomainRefreshStep(getDomainPresenceInfo(packet).getDomainName(),
366+
getDomainPresenceInfo(packet).getNamespace(), getNext()), packet);
367367
}
368368

369-
private Step createDomainRefreshStep(String domainName, String namespace) {
370-
return RequestBuilder.DOMAIN.get(namespace, domainName, new DomainUpdateStep());
369+
private Step createDomainRefreshStep(String domainName, String namespace, Step next) {
370+
return RequestBuilder.DOMAIN.get(namespace, domainName, new DomainUpdateStep(next));
371371
}
372372

373373
private boolean shouldRetry(Packet packet) {
@@ -402,6 +402,11 @@ void setHttpAsyncRequestStep(HttpRequestStep requestStep) {
402402
}
403403

404404
static class DomainUpdateStep extends DefaultResponseStep<DomainResource> {
405+
406+
DomainUpdateStep(Step next) {
407+
super(next);
408+
}
409+
405410
@Override
406411
public Result onSuccess(Packet packet, KubernetesApiResponse<DomainResource> callResponse) {
407412
if (callResponse.getObject() != null) {

0 commit comments

Comments
 (0)