wip

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

Author: csviri

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

@@ -243,7 +243,7 @@ public void addIndexers(Map<String, Function<R, List<String>>> indexers) {
    */
   @Override
   public Stream<R> list(String namespace, Predicate<R> predicate) {
-    return mergeWithTempCacheForList(manager().list(namespace, predicate), namespace, predicate);
+    return mergeWithTempCacheForList(manager().list(namespace), namespace, predicate);
   }
 
   /**
@@ -254,7 +254,7 @@ public Stream<R> list(String namespace, Predicate<R> predicate) {
    */
   @Override
   public Stream<R> list(Predicate<R> predicate) {
-    return mergeWithTempCacheForList(cache.list(predicate), null, predicate);
+    return mergeWithTempCacheForList(cache.list(), null, predicate);
   }
 
   /**
@@ -282,14 +282,16 @@ public List<R> byIndex(String indexName, String indexKey) {
         .collect(Collectors.toList());
   }
 
+  // namespace is filtered on informer manager level
   private Stream<R> mergeWithTempCacheForList(
       Stream<R> stream, String namespace, Predicate<R> predicate) {
     if (!comparableResourceVersions || temporaryResourceCache.isEmpty()) {
-      return stream.filter(filterResourceByNamespaceAndPredicate(namespace, predicate));
+
+      return stream.filter(filterResourceByPredicate(predicate));
     }
     var tempResources = new HashMap<>(temporaryResourceCache.getResources());
     if (tempResources.isEmpty()) {
-      return stream.filter(filterResourceByNamespaceAndPredicate(namespace, predicate));
+      return stream.filter(filterResourceByPredicate(predicate));
     }
 
     var upToDateList =
@@ -304,7 +306,8 @@ private Stream<R> mergeWithTempCacheForList(
                   }
                   return r;
                 })
-            .filter(filterResourceByNamespaceAndPredicate(namespace, predicate))
+            // we filter on predicate only since namespace changes would not be detected any ways.
+            .filter(filterResourceByPredicate(predicate))
             .toList();
 
     return Stream.concat(
@@ -352,6 +355,11 @@ private Stream<R> mergeWithTempCacheForIndex(
         upToDateList.stream());
   }
 
+  private static <R extends HasMetadata> Predicate<R> filterResourceByPredicate(
+      Predicate<R> predicate) {
+    return filterResourceByNamespaceAndPredicate(null, predicate);
+  }
+
   private static <R extends HasMetadata> Predicate<R> filterResourceByNamespaceAndPredicate(
       String namespace, Predicate<R> predicate) {
     return r -> {

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSourceTest.java

@@ -588,7 +588,7 @@ void listKeepsResourceWhenNotInTempCache() {
     when(temporaryResourceCache.getResources()).thenReturn(new HashMap<>());
 
     var mim = mock(InformerManager.class);
-    when(mim.list(nullable(String.class), any())).thenReturn(Stream.of(original));
+    when(mim.list(nullable(String.class))).thenReturn(Stream.of(original));
     doReturn(mim).when(informerEventSource).manager();
 
     var result = informerEventSource.list(null, r -> true).toList();
@@ -608,7 +608,7 @@ void listReplacesOnlyMatchingResources() {
         .thenReturn(new HashMap<>(Map.of(ResourceID.fromResource(dep1), newerDep1)));
 
     var informerManager = mock(InformerManager.class);
-    when(informerManager.list(nullable(String.class), any())).thenReturn(Stream.of(dep1, dep2));
+    when(informerManager.list(nullable(String.class))).thenReturn(Stream.of(dep1, dep2));
     doReturn(informerManager).when(informerEventSource).manager();
 
     var result = informerEventSource.list(null, r -> true).toList();
@@ -668,7 +668,7 @@ void listKeepsResourceWhenTempCacheHasOlderVersion() {
         .thenReturn(new HashMap<>(Map.of(ResourceID.fromResource(original), olderTemp)));
 
     var mim = mock(InformerManager.class);
-    when(mim.list(nullable(String.class), any())).thenReturn(Stream.of(original));
+    when(mim.list(nullable(String.class))).thenReturn(Stream.of(original));
     doReturn(mim).when(informerEventSource).manager();
 
     var result = informerEventSource.list(null, r -> true).toList();
@@ -706,7 +706,7 @@ void listAddsGhostResources() {
         .thenReturn(new HashMap<>(Map.of(ResourceID.fromResource(ghostResource), ghostResource)));
 
     var mim = mock(InformerManager.class);
-    when(mim.list(nullable(String.class), any())).thenReturn(Stream.of(resource));
+    when(mim.list(nullable(String.class))).thenReturn(Stream.of(resource));
     doReturn(mim).when(informerEventSource).manager();
 
     var result = informerEventSource.list(null, r -> true).toList();