Skip to content

Commit 07d60b3

Browse files
authored
Minor clean up watcher util (#1270)
1 parent d095892 commit 07d60b3

File tree

1 file changed

+2
-10
lines changed
  • spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher

1 file changed

+2
-10
lines changed

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/WatcherUtil.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,11 @@ static Set<String> apps(KubernetesObject kubernetesObject, String annotationName
104104
}
105105

106106
static Map<String, String> labels(KubernetesObject kubernetesObject) {
107-
V1ObjectMeta metadata = kubernetesObject.getMetadata();
108-
if (metadata == null) {
109-
return Map.of();
110-
}
111-
return Optional.ofNullable(metadata.getLabels()).orElse(Map.of());
107+
return Optional.ofNullable(kubernetesObject.getMetadata()).map(V1ObjectMeta::getLabels).orElse(Map.of());
112108
}
113109

114110
static Map<String, String> annotations(KubernetesObject kubernetesObject) {
115-
V1ObjectMeta metadata = kubernetesObject.getMetadata();
116-
if (metadata == null) {
117-
return Map.of();
118-
}
119-
return Optional.ofNullable(metadata.getAnnotations()).orElse(Map.of());
111+
return Optional.ofNullable(kubernetesObject.getMetadata()).map(V1ObjectMeta::getAnnotations).orElse(Map.of());
120112
}
121113

122114
private static void schedule(String type, String appName, long refreshDelay,

0 commit comments

Comments
 (0)