|
8 | 8 | import java.util.function.Predicate;
|
9 | 9 | import java.util.stream.Stream;
|
10 | 10 |
|
11 |
| -import org.slf4j.Logger; |
12 |
| -import org.slf4j.LoggerFactory; |
13 |
| - |
14 | 11 | import io.fabric8.kubernetes.api.model.HasMetadata;
|
15 | 12 | import io.fabric8.kubernetes.api.model.KubernetesResourceList;
|
16 | 13 | import io.fabric8.kubernetes.client.KubernetesClientException;
|
|
26 | 23 | import io.javaoperatorsdk.operator.processing.ResourceCache;
|
27 | 24 | import io.javaoperatorsdk.operator.processing.event.ResourceID;
|
28 | 25 |
|
| 26 | +import org.slf4j.Logger; |
| 27 | +import org.slf4j.LoggerFactory; |
| 28 | + |
29 | 29 | import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getName;
|
30 | 30 | import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
|
31 | 31 | import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
|
@@ -188,23 +188,19 @@ public Stream<T> list(Predicate<T> predicate) {
|
188 | 188 |
|
189 | 189 | @Override
|
190 | 190 | public Stream<T> list(String namespace) {
|
191 |
| - if (isWatchingAllNamespaces()) { |
192 |
| - return sharedIndexInformers.get(ANY_NAMESPACE_MAP_KEY).getStore().list().stream() |
193 |
| - .filter(r -> r.getMetadata() |
194 |
| - .getNamespace().equals(namespace)); |
195 |
| - } else { |
196 |
| - return sharedIndexInformers.get(namespace).getStore().list().stream(); |
197 |
| - } |
| 191 | + return list(namespace, null); |
198 | 192 | }
|
199 | 193 |
|
200 | 194 | @Override
|
201 | 195 | public Stream<T> list(String namespace, Predicate<T> predicate) {
|
202 | 196 | if (isWatchingAllNamespaces()) {
|
203 |
| - return sharedIndexInformers.get(ANY_NAMESPACE_MAP_KEY).getStore().list().stream() |
204 |
| - .filter(r -> r.getMetadata() |
205 |
| - .getNamespace().equals(namespace) && predicate.test(r)); |
| 197 | + final var stream = sharedIndexInformers.get(ANY_NAMESPACE_MAP_KEY).getStore().list().stream() |
| 198 | + .filter(r -> r.getMetadata().getNamespace().equals(namespace)); |
| 199 | + return predicate != null ? stream.filter(predicate) : stream; |
206 | 200 | } else {
|
207 |
| - return sharedIndexInformers.get(namespace).getStore().list().stream().filter(predicate); |
| 201 | + final var informer = sharedIndexInformers.get(namespace); |
| 202 | + return informer != null ? informer.getStore().list().stream().filter(predicate) |
| 203 | + : Stream.empty(); |
208 | 204 | }
|
209 | 205 | }
|
210 | 206 |
|
|
0 commit comments