4
4
5
5
package oracle .kubernetes .operator ;
6
6
7
- import io .kubernetes .client .ApiException ;
8
7
import io .kubernetes .client .models .V1ObjectMeta ;
9
8
import io .kubernetes .client .models .V1Pod ;
10
9
import java .util .ArrayList ;
14
13
import java .util .Map ;
15
14
import java .util .TreeMap ;
16
15
import java .util .concurrent .ConcurrentMap ;
16
+ import oracle .kubernetes .operator .calls .CallResponse ;
17
17
import oracle .kubernetes .operator .helpers .CallBuilder ;
18
18
import oracle .kubernetes .operator .helpers .DomainPresenceInfo ;
19
19
import oracle .kubernetes .operator .helpers .DomainPresenceInfo .ServerStartupInfo ;
20
- import oracle .kubernetes .operator .helpers .ResponseStep ;
21
20
import oracle .kubernetes .operator .helpers .ServerKubernetesObjects ;
22
21
import oracle .kubernetes .operator .logging .LoggingFacade ;
23
22
import oracle .kubernetes .operator .logging .LoggingFactory ;
@@ -645,31 +644,21 @@ private static NextAction doDomainUpdate(
645
644
meta .getName (),
646
645
meta .getNamespace (),
647
646
dom ,
648
- new ResponseStep <Domain >(next ) {
647
+ new DefaultResponseStep <Domain >(next ) {
649
648
@ 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 ) {
656
651
return doNext (packet ); // Just ignore update
657
652
}
658
653
return super .onFailure (
659
654
getRereadDomainConflictStep (info , meta , conflictStep ),
660
655
packet ,
661
- e ,
662
- statusCode ,
663
- responseHeaders );
656
+ callResponse );
664
657
}
665
658
666
659
@ 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 ());
673
662
return doNext (packet );
674
663
}
675
664
}),
@@ -685,12 +674,8 @@ private static Step getRereadDomainConflictStep(
685
674
meta .getNamespace (),
686
675
new DefaultResponseStep <Domain >(next ) {
687
676
@ 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 ());
694
679
return doNext (packet );
695
680
}
696
681
});
0 commit comments