From c79ce2dec910168cf9018bb78b4bdff7c843fa80 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sat, 30 Mar 2024 01:55:58 +0000 Subject: [PATCH] Bumping versions --- .../cloud/kubernetes/commons/config/ConfigUtils.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtils.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtils.java index bf0b4fcb..70f6b1ce 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtils.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtils.java @@ -215,7 +215,7 @@ public final class ConfigUtils { boolean containsActiveProfile = environment.getActiveProfiles().length == 0 || Arrays.stream(environment.getActiveProfiles()) .anyMatch(activeProfile -> sourceName.endsWith("-" + activeProfile) - || "default".equals(activeProfile)); + || "default".equals(activeProfile)); if (includeDefaultProfileData || containsActiveProfile || containsDataWithProfile(rawData, environment.getActiveProfiles())) { data.putAll(SourceDataEntriesProcessor.processAllEntries(rawData == null ? Map.of() : rawData, @@ -232,9 +232,8 @@ public final class ConfigUtils { * names to see if they contain any active profiles. */ private static boolean containsDataWithProfile(Map rawData, String[] activeProfiles) { - return rawData.keySet().stream().anyMatch( - key -> Arrays.stream(activeProfiles).anyMatch(activeProfile -> key.contains("-" + activeProfile) - || "default".equals(activeProfile))); + return rawData.keySet().stream().anyMatch(key -> Arrays.stream(activeProfiles) + .anyMatch(activeProfile -> key.contains("-" + activeProfile) || "default".equals(activeProfile))); } /**