Skip to content

Commit e5e5b02

Browse files
committed
fix null event source manager from context
1 parent 3564f04 commit e5e5b02

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ private <R extends CustomResource> void registerController(ResourceController<R>
6161
DefaultEventHandler defaultEventHandler = new DefaultEventHandler(resourceCache, eventDispatcher, controller.getClass().getName());
6262
DefaultEventSourceManager eventSourceManager = new DefaultEventSourceManager(defaultEventHandler);
6363
defaultEventHandler.setDefaultEventSourceManager(eventSourceManager);
64+
eventDispatcher.setEventSourceManager(eventSourceManager);
6465

6566
customResourceClients.put(resClass, (CustomResourceOperationsImpl) client);
6667

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@
88

99
public class DefaultContext<T extends CustomResource> implements Context<T> {
1010

11-
private final CustomResource customResource;
1211
private final List<Event> events;
12+
private final EventSourceManager eventSourceManager;
1313

14-
public DefaultContext(CustomResource customResource, List<Event> events) {
15-
this.customResource = customResource;
14+
public DefaultContext(EventSourceManager eventSourceManager, List<Event> events) {
1615
this.events = events;
16+
this.eventSourceManager = eventSourceManager;
1717
}
1818

1919
@Override
2020
public EventSourceManager getEventSourceManager() {
21-
return null;
21+
return eventSourceManager;
2222
}
2323

2424
@Override
2525
public List<Event> getEvents() {
26-
return null;
26+
return events;
2727
}
28+
2829
}

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import io.fabric8.kubernetes.client.dsl.Resource;
77
import io.javaoperatorsdk.operator.api.*;
88
import io.javaoperatorsdk.operator.processing.event.Event;
9+
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
910
import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
1011
import org.slf4j.Logger;
1112
import org.slf4j.LoggerFactory;
@@ -28,6 +29,7 @@ public class EventDispatcher {
2829
private final CustomResourceFacade customResourceFacade;
2930
private final boolean generationAware;
3031
private final Map<String, Long> lastGenerationProcessedSuccessfully = new ConcurrentHashMap<>();
32+
private EventSourceManager eventSourceManager;
3133

3234
public EventDispatcher(ResourceController controller,
3335
String finalizer,
@@ -38,6 +40,10 @@ public EventDispatcher(ResourceController controller,
3840
this.generationAware = generationAware;
3941
}
4042

43+
public void setEventSourceManager(EventSourceManager eventSourceManager) {
44+
this.eventSourceManager = eventSourceManager;
45+
}
46+
4147
public PostExecutionControl handleEvent(ExecutionScope event) {
4248
try {
4349
return handDispatch(event);
@@ -61,7 +67,7 @@ private PostExecutionControl handDispatch(ExecutionScope executionScope) {
6167
log.debug("Skipping event dispatching since its marked for deletion but has no finalizer: {}", executionScope);
6268
return PostExecutionControl.defaultDispatch();
6369
}
64-
Context context = new DefaultContext(executionScope.getCustomResource(), executionScope.getEvents());
70+
Context context = new DefaultContext(eventSourceManager, executionScope.getEvents());
6571
if (markedForDeletion(resource)) {
6672
return handleDelete(resource, context);
6773
} else {

0 commit comments

Comments
 (0)