Skip to content

Commit 453b999

Browse files
committed
refactor: simplify getCachedCustomResources
1 parent ae08281 commit 453b999

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

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

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@
66
import java.util.Optional;
77
import java.util.concurrent.ConcurrentHashMap;
88
import java.util.function.Predicate;
9-
import java.util.stream.Collectors;
109
import java.util.stream.Stream;
1110

12-
import org.slf4j.Logger;
13-
import org.slf4j.LoggerFactory;
14-
1511
import io.fabric8.kubernetes.api.model.HasMetadata;
1612
import io.fabric8.kubernetes.api.model.KubernetesResourceList;
1713
import io.fabric8.kubernetes.client.KubernetesClientException;
@@ -27,6 +23,9 @@
2723
import io.javaoperatorsdk.operator.processing.ResourceCache;
2824
import io.javaoperatorsdk.operator.processing.event.ResourceID;
2925

26+
import org.slf4j.Logger;
27+
import org.slf4j.LoggerFactory;
28+
3029
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getName;
3130
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
3231
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
@@ -186,16 +185,8 @@ public Stream<T> getCachedCustomResources() {
186185
}
187186

188187
public Stream<T> getCachedCustomResources(Predicate<T> predicate) {
189-
var streamList = sharedIndexInformers.values().stream()
190-
.map(i -> i.getStore().list().stream().filter(predicate)).collect(Collectors.toList());
191-
if (streamList.size() == 1) {
192-
return streamList.get(0);
193-
}
194-
var resStream = streamList.get(0);
195-
for (int i = 1; i < streamList.size(); i++) {
196-
resStream = Stream.concat(resStream, streamList.get(i));
197-
}
198-
return resStream;
188+
return sharedIndexInformers.values().stream()
189+
.flatMap(i -> i.getStore().list().stream().filter(predicate));
199190
}
200191

201192
/**

0 commit comments

Comments
 (0)