Skip to content

Commit 2349441

Browse files
committed
Missing review changes for DomainStatusUpdater
1 parent f7e4556 commit 2349441

File tree

1 file changed

+9
-24
lines changed

1 file changed

+9
-24
lines changed

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

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
package oracle.kubernetes.operator;
66

7-
import io.kubernetes.client.ApiException;
87
import io.kubernetes.client.models.V1ObjectMeta;
98
import io.kubernetes.client.models.V1Pod;
109
import java.util.ArrayList;
@@ -14,10 +13,10 @@
1413
import java.util.Map;
1514
import java.util.TreeMap;
1615
import java.util.concurrent.ConcurrentMap;
16+
import oracle.kubernetes.operator.calls.CallResponse;
1717
import oracle.kubernetes.operator.helpers.CallBuilder;
1818
import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
1919
import oracle.kubernetes.operator.helpers.DomainPresenceInfo.ServerStartupInfo;
20-
import oracle.kubernetes.operator.helpers.ResponseStep;
2120
import oracle.kubernetes.operator.helpers.ServerKubernetesObjects;
2221
import oracle.kubernetes.operator.logging.LoggingFacade;
2322
import oracle.kubernetes.operator.logging.LoggingFactory;
@@ -645,31 +644,21 @@ private static NextAction doDomainUpdate(
645644
meta.getName(),
646645
meta.getNamespace(),
647646
dom,
648-
new ResponseStep<Domain>(next) {
647+
new DefaultResponseStep<Domain>(next) {
649648
@Override
650-
public NextAction onFailure(
651-
Packet packet,
652-
ApiException e,
653-
int statusCode,
654-
Map<String, List<String>> responseHeaders) {
655-
if (statusCode == CallBuilder.NOT_FOUND) {
649+
public NextAction onFailure(Packet packet, CallResponse<Domain> callResponse) {
650+
if (callResponse.getStatusCode() == CallBuilder.NOT_FOUND) {
656651
return doNext(packet); // Just ignore update
657652
}
658653
return super.onFailure(
659654
getRereadDomainConflictStep(info, meta, conflictStep),
660655
packet,
661-
e,
662-
statusCode,
663-
responseHeaders);
656+
callResponse);
664657
}
665658

666659
@Override
667-
public NextAction onSuccess(
668-
Packet packet,
669-
Domain result,
670-
int statusCode,
671-
Map<String, List<String>> responseHeaders) {
672-
info.setDomain(result);
660+
public NextAction onSuccess(Packet packet, CallResponse<Domain> callResponse) {
661+
info.setDomain(callResponse.getResult());
673662
return doNext(packet);
674663
}
675664
}),
@@ -685,12 +674,8 @@ private static Step getRereadDomainConflictStep(
685674
meta.getNamespace(),
686675
new DefaultResponseStep<Domain>(next) {
687676
@Override
688-
public NextAction onSuccess(
689-
Packet packet,
690-
Domain result,
691-
int statusCode,
692-
Map<String, List<String>> responseHeaders) {
693-
info.setDomain(result);
677+
public NextAction onSuccess(Packet packet, CallResponse<Domain> callResponse) {
678+
info.setDomain(callResponse.getResult());
694679
return doNext(packet);
695680
}
696681
});

0 commit comments

Comments
 (0)