wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java

@@ -76,6 +76,7 @@ default boolean followControllerNamespaceChanges() {
 
   <P extends HasMetadata> PrimaryToSecondaryMapper<P> getPrimaryToSecondaryMapper();
 
+  // todo deprecate
   Optional<GroupVersionKind> getGroupVersionKind();
 
   default String name() {

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java

@@ -52,6 +52,11 @@ public class InformerEventSource<R extends HasMetadata, P extends HasMetadata>
   private final PrimaryToSecondaryIndex<R> primaryToSecondaryIndex;
   private final PrimaryToSecondaryMapper<P> primaryToSecondaryMapper;
 
+  /**
+   * @deprecated use {@link InformerEventSource(InformerEventSourceConfiguration)}
+   */
+  // todo migrate sample, separate PR?
+  @Deprecated(forRemoval = true)
   public InformerEventSource(
       InformerEventSourceConfiguration<R> configuration, EventSourceContext<P> context) {
     this(configuration);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerManager.java

@@ -104,21 +104,22 @@ private void initSources() {
 
   public void changeNamespaces(Set<String> namespaces) {
     var sourcesToRemove =
-        sources.keySet().stream().filter(k -> !namespaces.contains(k)).collect(Collectors.toSet());
+        sources.entrySet().stream()
+            .filter(e -> !namespaces.contains(e.getKey()))
+            .collect(Collectors.toSet());
     log.debug("Stopped informer {} for namespaces: {}", this, sourcesToRemove);
     sourcesToRemove.forEach(
-        k -> {
+        e -> {
           var informer =
               informerPool.releaseInformer(
                   controllerConfiguration.getName(),
                   configuration.getInformerConfig().getName(),
-                  getClassifier(k));
-          sources.remove(k);
+                  e.getValue().getClassifier());
+          sources.remove(e.getKey());
           informer.ifPresent(i -> i.removeEventHandler(eventHandler));
         });
 
-    var newNamespaces =
-        namespaces.stream().filter(ns -> !sources.containsKey(ns)).collect(Collectors.toList());
+    var newNamespaces = namespaces.stream().filter(ns -> !sources.containsKey(ns)).toList();
     if (newNamespaces.isEmpty()) {
       return;
     }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/pool/AbstractInformerPool.java

@@ -67,27 +67,14 @@ protected SharedIndexInformer createInformer(
 
     FilterWatchListDeletable filteredClient;
     if (WATCH_ALL_NAMESPACES.equals(classifier.namespaceIdentifier())) {
-      filteredClient =
-          clientWithResource
-              .inAnyNamespace()
-              .withLabelSelector(classifier.labelSelector())
-              .withShardSelector(classifier.shardSelector());
+      filteredClient = clientWithResource.inAnyNamespace();
     } else {
-      filteredClient =
-          clientWithResource
-              .inNamespace(classifier.namespaceIdentifier())
-              .withLabelSelector(classifier.labelSelector())
-              .withShardSelector(classifier.shardSelector());
-    }
-
-    if (classifier.labelSelector() != null) {
-      filteredClient =
-          (FilterWatchListDeletable) filteredClient.withLabelSelector(classifier.labelSelector());
-    }
-    if (classifier.shardSelector() != null) {
-      filteredClient =
-          (FilterWatchListDeletable) filteredClient.withShardSelector(classifier.shardSelector());
+      filteredClient = clientWithResource.inNamespace(classifier.namespaceIdentifier());
     }
+    filteredClient =
+        (FilterWatchListDeletable) filteredClient.withLabelSelector(classifier.labelSelector());
+    filteredClient =
+        (FilterWatchListDeletable) filteredClient.withShardSelector(classifier.shardSelector());
 
     if (classifier.fieldSelector() != null && !classifier.fieldSelector().getFields().isEmpty()) {
       for (var f : classifier.fieldSelector().getFields()) {