Skip to content

Commit e77f2dd

Browse files
committed
fix: use controller name instead of controller class name
1 parent a442af1 commit e77f2dd

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public <R extends CustomResource> void register(
5050
configuration = existing;
5151
}
5252
final var retry = GenericRetry.fromConfiguration(configuration.getRetryConfiguration());
53-
final var targetNamespaces = configuration.getNamespaces().toArray(new String[] {});
53+
final var targetNamespaces = configuration.getNamespaces().toArray(new String[]{});
5454
registerController(controller, configuration.watchAllNamespaces(), retry, targetNamespaces);
5555
}
5656
}
@@ -66,18 +66,16 @@ private <R extends CustomResource> void registerController(
6666
Class<R> resClass = configuration.getCustomResourceClass();
6767
String finalizer = configuration.getFinalizer();
6868
MixedOperation client = k8sClient.customResources(resClass);
69-
EventDispatcher eventDispatcher =
70-
new EventDispatcher(
71-
controller, finalizer, new EventDispatcher.CustomResourceFacade(client));
69+
EventDispatcher dispatcher = new EventDispatcher(controller, finalizer,
70+
new EventDispatcher.CustomResourceFacade(client));
7271

7372
CustomResourceCache customResourceCache = new CustomResourceCache();
7473
DefaultEventHandler defaultEventHandler =
75-
new DefaultEventHandler(
76-
customResourceCache, eventDispatcher, controller.getClass().getName(), retry);
74+
new DefaultEventHandler(customResourceCache, dispatcher, configuration.getName(), retry);
7775
DefaultEventSourceManager eventSourceManager =
7876
new DefaultEventSourceManager(defaultEventHandler, retry != null);
7977
defaultEventHandler.setEventSourceManager(eventSourceManager);
80-
eventDispatcher.setEventSourceManager(eventSourceManager);
78+
dispatcher.setEventSourceManager(eventSourceManager);
8179

8280
controller.init(eventSourceManager);
8381
CustomResourceEventSource customResourceEventSource =
@@ -111,7 +109,7 @@ private CustomResourceEventSource createCustomResourceEventSource(
111109
CustomResourceEventSource customResourceEventSource =
112110
watchAllNamespaces
113111
? CustomResourceEventSource.customResourceEventSourceForAllNamespaces(
114-
customResourceCache, client, generationAware, finalizer)
112+
customResourceCache, client, generationAware, finalizer)
115113
: CustomResourceEventSource.customResourceEventSourceForTargetNamespaces(
116114
customResourceCache, client, targetNamespaces, generationAware, finalizer);
117115

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import java.util.Optional;
1818
import java.util.Set;
1919
import java.util.concurrent.ScheduledThreadPoolExecutor;
20-
import java.util.concurrent.ThreadFactory;
2120
import java.util.concurrent.locks.ReentrantLock;
2221
import org.slf4j.Logger;
2322
import org.slf4j.LoggerFactory;
@@ -52,13 +51,7 @@ public DefaultEventHandler(
5251
eventBuffer = new EventBuffer();
5352
executor =
5453
new ScheduledThreadPoolExecutor(
55-
5,
56-
new ThreadFactory() {
57-
@Override
58-
public Thread newThread(Runnable runnable) {
59-
return new Thread(runnable, "EventHandler-" + relatedControllerName);
60-
}
61-
});
54+
5, runnable -> new Thread(runnable, "EventHandler-" + relatedControllerName));
6255
}
6356

6457
public void setEventSourceManager(DefaultEventSourceManager eventSourceManager) {

0 commit comments

Comments
 (0)