Skip to content

Commit 9ffbca9

Browse files
committed
refactor: remove EventSourceManager from Context
1 parent 1b4ee65 commit 9ffbca9

File tree

4 files changed

+3
-24
lines changed

4 files changed

+3
-24
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22

33
import io.fabric8.kubernetes.client.CustomResource;
44
import io.javaoperatorsdk.operator.processing.event.EventList;
5-
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
65
import java.util.Optional;
76

87
public interface Context<T extends CustomResource> {
98

10-
EventSourceManager getEventSourceManager();
11-
129
EventList getEvents();
1310

1411
Optional<RetryInfo> getRetryInfo();

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,16 @@
22

33
import io.fabric8.kubernetes.client.CustomResource;
44
import io.javaoperatorsdk.operator.processing.event.EventList;
5-
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
65
import java.util.Optional;
76

87
public class DefaultContext<T extends CustomResource> implements Context<T> {
98

109
private final RetryInfo retryInfo;
1110
private final EventList events;
12-
private final EventSourceManager eventSourceManager;
1311

14-
public DefaultContext(
15-
EventSourceManager eventSourceManager, EventList events, RetryInfo retryInfo) {
12+
public DefaultContext(EventList events, RetryInfo retryInfo) {
1613
this.retryInfo = retryInfo;
1714
this.events = events;
18-
this.eventSourceManager = eventSourceManager;
19-
}
20-
21-
@Override
22-
public EventSourceManager getEventSourceManager() {
23-
return eventSourceManager;
2415
}
2516

2617
@Override

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ public void close() {
8585

8686
public void setEventSourceManager(DefaultEventSourceManager eventSourceManager) {
8787
this.eventSourceManager = eventSourceManager;
88-
eventDispatcher.setEventSourceManager(eventSourceManager);
8988
}
9089

9190
@Override

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,19 @@
1515
import io.javaoperatorsdk.operator.api.ResourceController;
1616
import io.javaoperatorsdk.operator.api.UpdateControl;
1717
import io.javaoperatorsdk.operator.processing.event.EventList;
18-
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
1918
import org.slf4j.Logger;
2019
import org.slf4j.LoggerFactory;
2120

2221
/**
2322
* Dispatches events to the Controller and handles Finalizers for a single type of Custom Resource.
2423
*/
25-
public class EventDispatcher<R extends CustomResource> {
24+
class EventDispatcher<R extends CustomResource> {
2625

2726
private static final Logger log = LoggerFactory.getLogger(EventDispatcher.class);
2827

2928
private final ResourceController<R> controller;
3029
private final String resourceFinalizer;
3130
private final CustomResourceFacade<R> customResourceFacade;
32-
private EventSourceManager eventSourceManager;
3331

3432
EventDispatcher(
3533
ResourceController<R> controller,
@@ -47,10 +45,6 @@ public EventDispatcher(
4745
this(controller, finalizer, new CustomResourceFacade<>(client));
4846
}
4947

50-
public void setEventSourceManager(EventSourceManager eventSourceManager) {
51-
this.eventSourceManager = eventSourceManager;
52-
}
53-
5448
public PostExecutionControl handleExecution(ExecutionScope<R> executionScope) {
5549
try {
5650
return handleDispatch(executionScope);
@@ -87,9 +81,7 @@ private PostExecutionControl handleDispatch(ExecutionScope<R> executionScope) {
8781
}
8882
Context<R> context =
8983
new DefaultContext<>(
90-
eventSourceManager,
91-
new EventList(executionScope.getEvents()),
92-
executionScope.getRetryInfo());
84+
new EventList(executionScope.getEvents()), executionScope.getRetryInfo());
9385
if (resource.isMarkedForDeletion()) {
9486
return handleDelete(resource, context);
9587
} else {

0 commit comments

Comments
 (0)