From 07d60b32dd65da33af56acc4e735c277e1be977a Mon Sep 17 00:00:00 2001 From: erabii Date: Fri, 24 Mar 2023 14:57:15 +0200 Subject: [PATCH] Minor clean up watcher util (#1270) --- .../configuration/watcher/WatcherUtil.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/WatcherUtil.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/WatcherUtil.java index f1347b24..5b4c8e1f 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/WatcherUtil.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/WatcherUtil.java @@ -104,19 +104,11 @@ final class WatcherUtil { } static Map labels(KubernetesObject kubernetesObject) { - V1ObjectMeta metadata = kubernetesObject.getMetadata(); - if (metadata == null) { - return Map.of(); - } - return Optional.ofNullable(metadata.getLabels()).orElse(Map.of()); + return Optional.ofNullable(kubernetesObject.getMetadata()).map(V1ObjectMeta::getLabels).orElse(Map.of()); } static Map annotations(KubernetesObject kubernetesObject) { - V1ObjectMeta metadata = kubernetesObject.getMetadata(); - if (metadata == null) { - return Map.of(); - } - return Optional.ofNullable(metadata.getAnnotations()).orElse(Map.of()); + return Optional.ofNullable(kubernetesObject.getMetadata()).map(V1ObjectMeta::getAnnotations).orElse(Map.of()); } private static void schedule(String type, String appName, long refreshDelay,