Skip to content

Commit 1827227

Browse files
committed
refactor: make AbstractEventSource fields private
1 parent 48f4e18 commit 1827227

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@
55

66
public abstract class AbstractEventSource<P extends HasMetadata> implements EventSource<P> {
77

8-
protected volatile EventHandler eventHandler;
9-
protected volatile EventSourceRegistry<P> eventSourceRegistry;
8+
private volatile EventHandler eventHandler;
9+
private volatile EventSourceRegistry<P> eventSourceRegistry;
1010

1111
@Override
1212
public void setEventHandler(EventHandler eventHandler) {
1313
this.eventHandler = eventHandler;
1414
}
1515

16+
protected EventHandler getEventHandler() {
17+
return eventHandler;
18+
}
19+
1620
@Override
1721
public void setEventRegistry(EventSourceRegistry<P> registry) {
1822
this.eventSourceRegistry = registry;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected abstract V wrapEventSource(
5454
void eventReceived(ResourceAction action, T resource, T oldResource) {
5555
log.debug("Event received for resource: {}", getName(resource));
5656
if (filter.acceptChange(configuration, oldResource, resource)) {
57-
eventHandler.handleEvent(new ResourceEvent(action, ResourceID.fromResource(resource)));
57+
getEventHandler().handleEvent(new ResourceEvent(action, ResourceID.fromResource(resource)));
5858
} else {
5959
log.debug(
6060
"Skipping event handling resource {} with version: {}",

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void onDelete(T t, boolean b) {
8484

8585
private void propagateEvent(T object) {
8686
var primaryResourceIdSet =
87-
associatedPrimaries.associatedPrimaryResources(object, eventSourceRegistry);
87+
associatedPrimaries.associatedPrimaryResources(object, getEventRegistry());
8888
if (primaryResourceIdSet.isEmpty()) {
8989
return;
9090
}
@@ -95,8 +95,9 @@ private void propagateEvent(T object) {
9595
* automatically started, what would cause a NullPointerException here, since an event might
9696
* be received between creation and registration.
9797
*/
98+
final var eventHandler = getEventHandler();
9899
if (eventHandler != null) {
99-
this.eventHandler.handleEvent(event);
100+
eventHandler.handleEvent(event);
100101
}
101102
});
102103
}
@@ -123,7 +124,7 @@ public ResourceCache<T> getCache() {
123124
* @return the informed resource associated with the specified primary resource
124125
*/
125126
public T getAssociated(P resource) {
126-
return associatedWith.associatedSecondary(resource, eventSourceRegistry);
127+
return associatedWith.associatedSecondary(resource, getEventRegistry());
127128
}
128129

129130
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public EventProducerTimeTask(ResourceID customResourceUid) {
7070
public void run() {
7171
if (running.get()) {
7272
log.debug("Producing event for custom resource id: {}", customResourceUid);
73-
eventHandler.handleEvent(new Event(customResourceUid));
73+
getEventHandler().handleEvent(new Event(customResourceUid));
7474
}
7575
}
7676
}

0 commit comments

Comments
 (0)