Skip to content

Commit 574daaa

Browse files
committed
refactor: expose only ResourceCache and not controller EventSource
1 parent 02e5557 commit 574daaa

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class EventProcessor<R extends HasMetadata> implements EventHandler, LifecycleAw
5454

5555
EventProcessor(EventSourceManager<R> eventSourceManager) {
5656
this(
57-
eventSourceManager.getControllerResourceEventSource(),
57+
eventSourceManager.getResourceCache(),
5858
ExecutorServiceManager.instance().executorService(),
5959
eventSourceManager.getController().getConfiguration().getName(),
6060
new ReconciliationDispatcher<>(eventSourceManager.getController()),
@@ -69,7 +69,7 @@ class EventProcessor<R extends HasMetadata> implements EventHandler, LifecycleAw
6969
EventSourceManager<R> eventSourceManager,
7070
String relatedControllerName,
7171
Retry retry) {
72-
this(eventSourceManager.getControllerResourceEventSource(), null, relatedControllerName,
72+
this(eventSourceManager.getResourceCache(), null, relatedControllerName,
7373
reconciliationDispatcher, retry, null, eventSourceManager);
7474
}
7575

@@ -213,7 +213,7 @@ void eventProcessingFinished(
213213
}
214214

215215
private void postponeReconciliationAndHandleCacheSyncEvent(ResourceID resourceID) {
216-
eventSourceManager.getControllerResourceEventSource().whitelistNextEvent(resourceID);
216+
eventSourceManager.controllerResourceEventSource().whitelistNextEvent(resourceID);
217217
}
218218

219219
private boolean isCacheReadyForInstantReconciliation(ExecutionScope<R> executionScope,

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import io.javaoperatorsdk.operator.OperatorException;
1515
import io.javaoperatorsdk.operator.processing.Controller;
1616
import io.javaoperatorsdk.operator.processing.LifecycleAware;
17+
import io.javaoperatorsdk.operator.processing.ResourceCache;
1718
import io.javaoperatorsdk.operator.processing.event.source.ControllerResourceEventSource;
1819
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
1920
import io.javaoperatorsdk.operator.processing.event.source.EventSourceRegistry;
@@ -124,7 +125,11 @@ public Set<EventSource> getRegisteredEventSources() {
124125
}
125126

126127
@Override
127-
public ControllerResourceEventSource<R> getControllerResourceEventSource() {
128+
public ResourceCache<R> getResourceCache() {
129+
return controllerResourceEventSource();
130+
}
131+
132+
ControllerResourceEventSource<R> controllerResourceEventSource() {
128133
return controllerResourceEventSource;
129134
}
130135

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

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

55
import io.fabric8.kubernetes.api.model.HasMetadata;
66
import io.javaoperatorsdk.operator.OperatorException;
7+
import io.javaoperatorsdk.operator.processing.ResourceCache;
78

89
public interface EventSourceRegistry<T extends HasMetadata> {
910

@@ -20,6 +21,5 @@ void registerEventSource(EventSource eventSource)
2021

2122
Set<EventSource> getRegisteredEventSources();
2223

23-
ControllerResourceEventSource<T> getControllerResourceEventSource();
24-
24+
ResourceCache<T> getResourceCache();
2525
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class EventProcessorTest {
5050

5151
@BeforeEach
5252
public void setup() {
53-
when(eventSourceManagerMock.getControllerResourceEventSource()).thenReturn(resourceCacheMock);
53+
when(eventSourceManagerMock.getResourceCache()).thenReturn(resourceCacheMock);
5454

5555
eventProcessor =
5656
spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test", null));
@@ -238,8 +238,8 @@ public void whitelistNextEventIfTheCacheIsNotPropagatedAfterAnUpdate() {
238238
var mockCREventSource = mock(ControllerResourceEventSource.class);
239239
eventProcessor.getEventMarker().markEventReceived(crID);
240240
when(resourceCacheMock.getCustomResource(eq(crID))).thenReturn(Optional.of(cr));
241-
when(eventSourceManagerMock.getControllerResourceEventSource())
242-
.thenReturn(mockCREventSource);
241+
when(eventSourceManagerMock.getResourceCache()).thenReturn(mockCREventSource);
242+
when(eventSourceManagerMock.controllerResourceEventSource()).thenReturn(mockCREventSource);
243243

244244
eventProcessor.eventProcessingFinished(new ExecutionScope(cr, null),
245245
PostExecutionControl.customResourceUpdated(updatedCr));
@@ -258,7 +258,7 @@ public void dontWhitelistsEventWhenOtherChangeDuringExecution() {
258258
var mockCREventSource = mock(ControllerResourceEventSource.class);
259259
eventProcessor.getEventMarker().markEventReceived(crID);
260260
when(resourceCacheMock.getCustomResource(eq(crID))).thenReturn(Optional.of(otherChangeCR));
261-
when(eventSourceManagerMock.getControllerResourceEventSource())
261+
when(eventSourceManagerMock.getResourceCache())
262262
.thenReturn(mockCREventSource);
263263

264264
eventProcessor.eventProcessingFinished(new ExecutionScope(cr, null),
@@ -274,7 +274,7 @@ public void dontWhitelistsEventIfUpdatedEventInCache() {
274274
var mockCREventSource = mock(ControllerResourceEventSource.class);
275275
eventProcessor.getEventMarker().markEventReceived(crID);
276276
when(resourceCacheMock.getCustomResource(eq(crID))).thenReturn(Optional.of(cr));
277-
when(eventSourceManagerMock.getControllerResourceEventSource())
277+
when(eventSourceManagerMock.getResourceCache())
278278
.thenReturn(mockCREventSource);
279279

280280
eventProcessor.eventProcessingFinished(new ExecutionScope(cr, null),

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void prepareEventSources(EventSourceRegistry<Webapp> eventSourceRegistry)
4343
// we need to find which WebApp this Tomcat custom resource is related to.
4444
// To find the related customResourceId of the WebApp resource we traverse the cache to
4545
// and identify it based on naming convention.
46-
return eventSourceRegistry.getControllerResourceEventSource()
46+
return eventSourceRegistry.getResourceCache()
4747
.getCachedCustomResources(
4848
(Webapp webApp) -> webApp.getSpec().getTomcat()
4949
.equals(t.getMetadata().getName()))

0 commit comments

Comments
 (0)