@@ -434,12 +434,9 @@ private static class DummyReconciler
434434
435435 private static io .javaoperatorsdk .operator .processing .retry .GenericRetry applyAndGetRetry (
436436 java .util .function .Consumer <
437- io .javaoperatorsdk .operator .api .config .ControllerConfigurationOverrider <
438- io .fabric8 .kubernetes .api .model .ConfigMap >>
437+ ControllerConfigurationOverrider <io .fabric8 .kubernetes .api .model .ConfigMap >>
439438 consumer ) {
440- var overrider =
441- io .javaoperatorsdk .operator .api .config .ControllerConfigurationOverrider .override (
442- baseControllerConfig ());
439+ var overrider = ControllerConfigurationOverrider .override (baseControllerConfig ());
443440 consumer .accept (overrider );
444441 return (io .javaoperatorsdk .operator .processing .retry .GenericRetry ) overrider .build ().getRetry ();
445442 }
@@ -448,9 +445,7 @@ private static io.javaoperatorsdk.operator.processing.retry.GenericRetry applyAn
448445 void retryIsNotConfiguredWhenNoRetryPropertiesPresent () {
449446 var loader = new ConfigLoader (mapProvider (Map .of ()));
450447 var consumer = loader .<io .fabric8 .kubernetes .api .model .ConfigMap >applyControllerConfigs ("ctrl" );
451- var overrider =
452- io .javaoperatorsdk .operator .api .config .ControllerConfigurationOverrider .override (
453- baseControllerConfig ());
448+ var overrider = ControllerConfigurationOverrider .override (baseControllerConfig ());
454449 consumer .accept (overrider );
455450 // no retry property set → retry stays at the controller's default (null or unchanged)
456451 var result = overrider .build ();
@@ -564,12 +559,9 @@ void retryIsIsolatedPerControllerName() {
564559
565560 private static Set <String > applyAndGetNamespaces (
566561 java .util .function .Consumer <
567- io .javaoperatorsdk .operator .api .config .ControllerConfigurationOverrider <
568- io .fabric8 .kubernetes .api .model .ConfigMap >>
562+ ControllerConfigurationOverrider <io .fabric8 .kubernetes .api .model .ConfigMap >>
569563 consumer ) {
570- var overrider =
571- io .javaoperatorsdk .operator .api .config .ControllerConfigurationOverrider .override (
572- baseControllerConfig ());
564+ var overrider = ControllerConfigurationOverrider .override (baseControllerConfig ());
573565 consumer .accept (overrider );
574566 return overrider .build ().getInformerConfig ().getNamespaces ();
575567 }
@@ -610,9 +602,7 @@ void watchAllNamespacesCanBeRequestedExplicitly() {
610602 new ConfigLoader (
611603 mapProvider (
612604 Map .of ("josdk.controller.ctrl.namespaces" , Constants .WATCH_ALL_NAMESPACES )));
613- var overrider =
614- io .javaoperatorsdk .operator .api .config .ControllerConfigurationOverrider .override (
615- baseControllerConfig ());
605+ var overrider = ControllerConfigurationOverrider .override (baseControllerConfig ());
616606 loader
617607 .<io .fabric8 .kubernetes .api .model .ConfigMap >applyControllerConfigs ("ctrl" )
618608 .accept (overrider );
@@ -625,9 +615,7 @@ void watchCurrentNamespaceCanBeRequested() {
625615 new ConfigLoader (
626616 mapProvider (
627617 Map .of ("josdk.controller.ctrl.namespaces" , Constants .WATCH_CURRENT_NAMESPACE )));
628- var overrider =
629- io .javaoperatorsdk .operator .api .config .ControllerConfigurationOverrider .override (
630- baseControllerConfig ());
618+ var overrider = ControllerConfigurationOverrider .override (baseControllerConfig ());
631619 loader
632620 .<io .fabric8 .kubernetes .api .model .ConfigMap >applyControllerConfigs ("ctrl" )
633621 .accept (overrider );
0 commit comments