Skip to content

Commit 9161d44

Browse files
committed
refactor: make CustomResourceFacade package-only
1 parent dc1ce6a commit 9161d44

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,7 @@ public <R extends CustomResource> void register(
137137
}
138138

139139
final var client = k8sClient.customResources(resClass);
140-
EventDispatcher dispatcher =
141-
new EventDispatcher(
142-
controller, finalizer, new EventDispatcher.CustomResourceFacade(client));
140+
EventDispatcher dispatcher = new EventDispatcher(controller, finalizer, client);
143141

144142
CustomResourceCache customResourceCache = new CustomResourceCache(objectMapper);
145143
DefaultEventHandler defaultEventHandler =

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,17 @@ public class EventDispatcher {
3030
private final CustomResourceFacade customResourceFacade;
3131
private EventSourceManager eventSourceManager;
3232

33-
public EventDispatcher(
33+
EventDispatcher(
3434
ResourceController controller, String finalizer, CustomResourceFacade customResourceFacade) {
3535
this.controller = controller;
3636
this.customResourceFacade = customResourceFacade;
3737
this.resourceFinalizer = finalizer;
3838
}
3939

40+
public EventDispatcher(ResourceController controller, String finalizer, MixedOperation client) {
41+
this(controller, finalizer, new CustomResourceFacade(client));
42+
}
43+
4044
public void setEventSourceManager(EventSourceManager eventSourceManager) {
4145
this.eventSourceManager = eventSourceManager;
4246
}
@@ -174,7 +178,7 @@ private CustomResource replace(CustomResource resource) {
174178
}
175179

176180
// created to support unit testing
177-
public static class CustomResourceFacade<R extends CustomResource> {
181+
static class CustomResourceFacade<R extends CustomResource> {
178182

179183
private final MixedOperation<R, KubernetesResourceList<R>, Resource<R>> resourceOperation;
180184

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import io.javaoperatorsdk.operator.api.ResourceController;
2020
import io.javaoperatorsdk.operator.api.RetryInfo;
2121
import io.javaoperatorsdk.operator.api.UpdateControl;
22-
import io.javaoperatorsdk.operator.processing.EventDispatcher;
23-
import io.javaoperatorsdk.operator.processing.ExecutionScope;
2422
import io.javaoperatorsdk.operator.processing.event.Event;
2523
import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
2624
import java.util.ArrayList;

0 commit comments

Comments
 (0)