44
55package oracle .kubernetes .operator ;
66
7- import io .kubernetes .client .ApiException ;
87import io .kubernetes .client .models .V1ObjectMeta ;
98import io .kubernetes .client .models .V1Pod ;
109import java .util .ArrayList ;
1413import java .util .Map ;
1514import java .util .TreeMap ;
1615import java .util .concurrent .ConcurrentMap ;
16+ import oracle .kubernetes .operator .calls .CallResponse ;
1717import oracle .kubernetes .operator .helpers .CallBuilder ;
1818import oracle .kubernetes .operator .helpers .DomainPresenceInfo ;
1919import oracle .kubernetes .operator .helpers .DomainPresenceInfo .ServerStartupInfo ;
20- import oracle .kubernetes .operator .helpers .ResponseStep ;
2120import oracle .kubernetes .operator .helpers .ServerKubernetesObjects ;
2221import oracle .kubernetes .operator .logging .LoggingFacade ;
2322import 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