Skip to content

Commit ae430f8

Browse files
committed
Revert "Directly specify next step following a response rather than use chaining"
This reverts commit d522d00.
1 parent 8734525 commit ae430f8

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

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

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

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

135-
private Step createClusterResourceRefreshStep(Step next) {
137+
private Step createClusterResourceRefreshStep() {
136138
return RequestBuilder.CLUSTER.get(
137-
context.getNamespace(), context.getClusterResourceName(), new ReadClusterResponseStep(next));
139+
context.getNamespace(), context.getClusterResourceName(), new ReadClusterResponseStep());
138140
}
139141
}
140142

@@ -284,11 +286,6 @@ private Step createReplaceClusterStatusAsyncStep() {
284286
}
285287

286288
private static class ReadClusterResponseStep extends ResponseStep<ClusterResource> {
287-
288-
private ReadClusterResponseStep(Step step) {
289-
super(step);
290-
}
291-
292289
@Override
293290
public Result onSuccess(Packet packet, KubernetesApiResponse<ClusterResource> callResponse) {
294291
if (callResponse.getObject() != null) {

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

Lines changed: 4 additions & 9 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(createDomainRefreshStep(getDomainPresenceInfo(packet).getDomainName(),
366-
getDomainPresenceInfo(packet).getNamespace(), getNext()), packet);
365+
return doNext(Step.chain(createDomainRefreshStep(getDomainPresenceInfo(packet).getDomainName(),
366+
getDomainPresenceInfo(packet).getNamespace()), getNext()), packet);
367367
}
368368

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

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

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

0 commit comments

Comments
 (0)