test fix

Signed-off-by: Attila Mészáros <csviri@gmail.com>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java

@@ -44,7 +44,7 @@ public <T> Set<T> getSecondaryResources(Class<T> expectedType) {
 
   @Override
   public IndexedResourceCache<P> getPrimaryCache() {
-    return controller.getEventSourceManager().getControllerResourceEventSource();
+    return controller.getEventSourceManager().getControllerEventSource();
   }
 
   @Override

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/Controller.java

@@ -99,7 +99,7 @@ public Controller(Reconciler<P> reconciler,
     eventSourceManager.postProcessDefaultEventSourcesAfterProcessorInitializer();
     controllerHealthInfo = new ControllerHealthInfo(eventSourceManager);
     eventSourceContext = new EventSourceContext<>(
-        eventSourceManager.getControllerResourceEventSource(), configuration, kubernetesClient);
+        eventSourceManager.getControllerEventSource(), configuration, kubernetesClient);
     initAndRegisterEventSources(eventSourceContext);
     configurationService.getMetrics().controllerRegistered(this);
   }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java

@@ -52,7 +52,7 @@ public EventProcessor(EventSourceManager<P> eventSourceManager,
     this(
         eventSourceManager.getController().getConfiguration(),
         new ReconciliationDispatcher<>(eventSourceManager.getController()), eventSourceManager,
-        configurationService.getMetrics(), eventSourceManager.getControllerResourceEventSource());
+        configurationService.getMetrics(), eventSourceManager.getControllerEventSource());
   }
 
   @SuppressWarnings("rawtypes")
@@ -64,7 +64,7 @@ public EventProcessor(EventSourceManager<P> eventSourceManager,
     this(
         controllerConfiguration,
         reconciliationDispatcher, eventSourceManager, metrics,
-        eventSourceManager.getControllerResourceEventSource());
+        eventSourceManager.getControllerEventSource());
   }
 
   @SuppressWarnings({"rawtypes", "unchecked"})

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSourceManager.java

@@ -194,7 +194,7 @@ public List<EventSource> allEventSources() {
     return eventSources.allEventSources().toList();
   }
 
-  public ControllerEventSource<P> getControllerResourceEventSource() {
+  public ControllerEventSource<P> getControllerEventSource() {
     return eventSources.controllerEventSource();
   }
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSources.java

@@ -75,11 +75,6 @@ public void add(EventSource eventSource) {
     sources.computeIfAbsent(keyFor(eventSource), k -> new HashMap<>()).put(name, eventSource);
   }
 
-  @SuppressWarnings("rawtypes")
-  private Class<?> getResourceType(EventSource source) {
-    return source.resourceType();
-  }
-
   private String keyFor(EventSource source) {
     return keyFor(source.resourceType());
   }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerEventSource.java

@@ -26,7 +26,7 @@ public class ControllerEventSource<T extends HasMetadata>
     implements ResourceEventHandler<T> {
 
   private static final Logger log = LoggerFactory.getLogger(ControllerEventSource.class);
-  private static final String NAME = "ControllerResourceEventSource";
+  public static final String NAME = "ControllerResourceEventSource";
 
   private final Controller<T> controller;
 

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventProcessorTest.java

@@ -66,7 +66,7 @@ class EventProcessorTest {
       mock(ReconciliationDispatcher.class);
   private final EventSourceManager eventSourceManagerMock = mock(EventSourceManager.class);
   private final TimerEventSource retryTimerEventSourceMock = mock(TimerEventSource.class);
-  private final ControllerEventSource controllerResourceEventSourceMock =
+  private final ControllerEventSource controllerEventSourceMock =
       mock(ControllerEventSource.class);
   private final Metrics metricsMock = mock(Metrics.class);
   private EventProcessor eventProcessor;
@@ -75,8 +75,8 @@ class EventProcessorTest {
 
   @BeforeEach
   void setup() {
-    when(eventSourceManagerMock.getControllerResourceEventSource())
-        .thenReturn(controllerResourceEventSourceMock);
+    when(eventSourceManagerMock.getControllerEventSource())
+        .thenReturn(controllerEventSourceMock);
     eventProcessor =
         spy(new EventProcessor(controllerConfiguration(null, rateLimiterMock),
             reconciliationDispatcherMock,
@@ -103,7 +103,7 @@ void dispatchesEventsIfNoExecutionInProgress() {
   @Test
   void skipProcessingIfLatestCustomResourceNotInCache() {
     Event event = prepareCREvent();
-    when(controllerResourceEventSourceMock.get(event.getRelatedCustomResourceID()))
+    when(controllerEventSourceMock.get(event.getRelatedCustomResourceID()))
         .thenReturn(Optional.empty());
 
     eventProcessor.handleEvent(event);
@@ -275,7 +275,7 @@ void startProcessedMarkedEventReceivedBefore() {
             LinearRateLimiter.deactivatedRateLimiter()), reconciliationDispatcherMock,
             eventSourceManagerMock,
             metricsMock));
-    when(controllerResourceEventSourceMock.get(eq(crID)))
+    when(controllerEventSourceMock.get(eq(crID)))
         .thenReturn(Optional.of(testCustomResource()));
     eventProcessor.handleEvent(new Event(crID));
 
@@ -297,7 +297,7 @@ void notUpdatesEventSourceHandlerIfResourceUpdated() {
 
     eventProcessorWithRetry.eventProcessingFinished(executionScope, postExecutionControl);
 
-    verify(controllerResourceEventSourceMock, times(0)).handleRecentResourceUpdate(any(), any(),
+    verify(controllerEventSourceMock, times(0)).handleRecentResourceUpdate(any(), any(),
         any());
   }
 
@@ -468,15 +468,15 @@ private ResourceEvent prepareCREvent() {
   }
 
   private ResourceEvent prepareCREvent(HasMetadata hasMetadata) {
-    when(controllerResourceEventSourceMock.get(eq(ResourceID.fromResource(hasMetadata))))
+    when(controllerEventSourceMock.get(eq(ResourceID.fromResource(hasMetadata))))
         .thenReturn(Optional.of(hasMetadata));
     return new ResourceEvent(ResourceAction.UPDATED,
         ResourceID.fromResource(hasMetadata), hasMetadata);
   }
 
   private ResourceEvent prepareCREvent(ResourceID resourceID) {
     TestCustomResource customResource = testCustomResource(resourceID);
-    when(controllerResourceEventSourceMock.get(eq(resourceID)))
+    when(controllerEventSourceMock.get(eq(resourceID)))
         .thenReturn(Optional.of(customResource));
     return new ResourceEvent(ResourceAction.UPDATED,
         ResourceID.fromResource(customResource), customResource);

operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerRelatedBehaviorITS.java

@@ -142,7 +142,7 @@ private void assertInformerNotWatchingForAdditionalNamespace(Operator operator)
 
     InformerHealthIndicator controllerHealthIndicator =
         (InformerHealthIndicator) unhealthyEventSources
-            .get(ControllerEventSource.class.getSimpleName())
+            .get(ControllerEventSource.NAME)
             .informerHealthIndicators().get(additionalNamespace);
     assertThat(controllerHealthIndicator).isNotNull();
     assertThat(controllerHealthIndicator.getTargetNamespace()).isEqualTo(additionalNamespace);
@@ -269,13 +269,13 @@ private void assertRuntimeInfoNoCRPermission(Operator operator) {
         operator.getRuntimeInfo().unhealthyEventSources()
             .get(INFORMER_RELATED_BEHAVIOR_TEST_RECONCILER);
     assertThat(unhealthyEventSources).isNotEmpty();
-    assertThat(unhealthyEventSources.get(ControllerEventSource.class.getSimpleName()))
+    assertThat(unhealthyEventSources.get(ControllerEventSource.NAME))
         .isNotNull();
     var informerHealthIndicators = operator.getRuntimeInfo()
         .unhealthyInformerWrappingEventSourceHealthIndicator()
         .get(INFORMER_RELATED_BEHAVIOR_TEST_RECONCILER);
     assertThat(informerHealthIndicators).isNotEmpty();
-    assertThat(informerHealthIndicators.get(ControllerEventSource.class.getSimpleName())
+    assertThat(informerHealthIndicators.get(ControllerEventSource.NAME)
         .informerHealthIndicators())
         .hasSize(1);
   }