Skip to content

Commit 53b380a

Browse files
committed
feat!: remove EventSourceManager accessor from Context
1 parent 15151ed commit 53b380a

File tree

4 files changed

+2
-24
lines changed

4 files changed

+2
-24
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
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> {
9-
10-
EventSourceManager getEventSourceManager();
11-
128
EventList getEvents();
139

1410
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
@@ -72,7 +72,6 @@ public DefaultEventHandler(
7272

7373
public void setEventSourceManager(DefaultEventSourceManager eventSourceManager) {
7474
this.eventSourceManager = eventSourceManager;
75-
eventDispatcher.setEventSourceManager(eventSourceManager);
7675
}
7776

7877
@Override

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import io.javaoperatorsdk.operator.api.ResourceController;
1515
import io.javaoperatorsdk.operator.api.UpdateControl;
1616
import io.javaoperatorsdk.operator.processing.event.EventList;
17-
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
1817
import org.slf4j.Logger;
1918
import org.slf4j.LoggerFactory;
2019

@@ -28,7 +27,6 @@ public class EventDispatcher<R extends CustomResource> {
2827
private final ResourceController<R> controller;
2928
private final String resourceFinalizer;
3029
private final CustomResourceFacade<R> customResourceFacade;
31-
private EventSourceManager eventSourceManager;
3230

3331
EventDispatcher(
3432
ResourceController<R> controller,
@@ -46,10 +44,6 @@ public EventDispatcher(
4644
this(controller, finalizer, new CustomResourceFacade<>(client));
4745
}
4846

49-
public void setEventSourceManager(EventSourceManager eventSourceManager) {
50-
this.eventSourceManager = eventSourceManager;
51-
}
52-
5347
public PostExecutionControl handleExecution(ExecutionScope<R> executionScope) {
5448
try {
5549
return handleDispatch(executionScope);
@@ -79,9 +73,7 @@ private PostExecutionControl handleDispatch(ExecutionScope<R> executionScope) {
7973
}
8074
Context<R> context =
8175
new DefaultContext<>(
82-
eventSourceManager,
83-
new EventList(executionScope.getEvents()),
84-
executionScope.getRetryInfo());
76+
new EventList(executionScope.getEvents()), executionScope.getRetryInfo());
8577
if (resource.isMarkedForDeletion()) {
8678
return handleDelete(resource, context);
8779
} else {

0 commit comments

Comments
 (0)