clean

Signed-off-by: wind57 <[email protected]>

Author: wind57

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtils.java

@@ -20,6 +20,7 @@
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -57,9 +58,9 @@ public final class ConfigUtils {
 
 	// sourceName (configmap or secret name) ends with : "-dev.yaml" or the like.
 	private static final BiPredicate<String, String> ENDS_WITH_PROFILE_AND_EXTENSION = (sourceName,
-			activeProfile) -> sourceName.endsWith("-" + activeProfile + ".yml")
-					|| sourceName.endsWith("-" + activeProfile + ".yaml")
-					|| sourceName.endsWith("-" + activeProfile + ".properties");
+		activeProfile) -> sourceName.endsWith("-" + activeProfile + ".yml")
+		|| sourceName.endsWith("-" + activeProfile + ".yaml")
+		|| sourceName.endsWith("-" + activeProfile + ".properties");
 
 	private static final ApplicationListener<?> NO_OP = (e) -> {
 	};
@@ -70,7 +71,7 @@ private ConfigUtils() {
 	public static String getApplicationName(Environment env, String configName, String configurationTarget) {
 		if (!StringUtils.hasLength(configName)) {
 			LOG.debug(configurationTarget + " name has not been set, taking it from property/env "
-					+ SPRING_APPLICATION_NAME + " (default=" + FALLBACK_APPLICATION_NAME + ")");
+				+ SPRING_APPLICATION_NAME + " (default=" + FALLBACK_APPLICATION_NAME + ")");
 			configName = env.getProperty(SPRING_APPLICATION_NAME, FALLBACK_APPLICATION_NAME);
 		}
 
@@ -90,7 +91,7 @@ public static String getApplicationName(Environment env, String configName, Stri
 	 * @return prefix to use in normalized sources
 	 */
 	public static Prefix findPrefix(String explicitPrefix, Boolean useNameAsPrefix, boolean defaultUseNameAsPrefix,
-			String normalizedName) {
+		String normalizedName) {
 		// if explicitPrefix is set, it takes priority over useNameAsPrefix
 		// (either the one from 'spring.cloud.kubernetes.config|secrets' or
 		// 'spring.cloud.kubernetes.config|secrets.sources')
@@ -140,7 +141,7 @@ public static Prefix findPrefix(String explicitPrefix, Boolean useNameAsPrefix,
 	 * @return useProfileNameAsPrefix to be used in normalized sources
 	 */
 	public static boolean includeProfileSpecificSources(boolean defaultIncludeProfileSpecificSources,
-			Boolean includeProfileSpecificSources) {
+		Boolean includeProfileSpecificSources) {
 		if (includeProfileSpecificSources != null) {
 			return includeProfileSpecificSources;
 		}
@@ -157,21 +158,6 @@ public static void onException(boolean failFast, Exception e) {
 		LOG.warn(e.getMessage() + ". Ignoring.", e);
 	}
 
-	/*
-	 * This method will return a SourceData that has a name in the form :
-	 * "configmap.my-configmap.my-configmap-2.namespace" and the "data" from the context
-	 * is appended with prefix. So if incoming is "a=b", the result will be : "prefix.a=b"
-	 */
-	@Deprecated(forRemoval = true)
-	public static SourceData withPrefix(String target, PrefixContext context) {
-		Map<String, Object> withPrefix = CollectionUtils.newHashMap(context.data().size());
-		context.data().forEach((key, value) -> withPrefix.put(context.prefix() + "." + key, value));
-
-		String propertySourceTokens = String.join(PROPERTY_SOURCE_NAME_SEPARATOR,
-				context.propertySourceNames().stream().sorted().collect(Collectors.toCollection(LinkedHashSet::new)));
-		return new SourceData(sourceName(target, propertySourceTokens, context.namespace()), withPrefix);
-	}
-
 	public static String sourceName(String target, String applicationName, String namespace) {
 		return target + PROPERTY_SOURCE_NAME_SEPARATOR + applicationName + PROPERTY_SOURCE_NAME_SEPARATOR + namespace;
 	}
@@ -185,7 +171,7 @@ public static String sourceName(String target, String applicationName, String na
 	}
 
 	public static MultipleSourcesContainer processNamedData(List<StrippedSourceContainer> strippedSources,
-			Environment environment, LinkedHashSet<String> sourceNames, String namespace, boolean decode) {
+		Environment environment, LinkedHashSet<String> sourceNames, String namespace, boolean decode) {
 		return processNamedData(strippedSources, environment, sourceNames, namespace, decode, true);
 	}
 
@@ -195,14 +181,13 @@ public static MultipleSourcesContainer processNamedData(List<StrippedSourceConta
 	 * defined order).
 	 */
 	public static MultipleSourcesContainer processNamedData(List<StrippedSourceContainer> strippedSources,
-			Environment environment, LinkedHashSet<String> sourceNames, String namespace, boolean decode,
-			boolean includeDefaultProfileData) {
+		Environment environment, LinkedHashSet<String> sourceNames, String namespace, boolean decode,
+		boolean includeDefaultProfileData) {
 
 		Map<String, StrippedSourceContainer> hashByName = strippedSources.stream()
 			.collect(Collectors.toMap(StrippedSourceContainer::name, Function.identity()));
 
-		LinkedHashSet<String> foundSourceNames = new LinkedHashSet<>();
-		Map<String, Object> data = new HashMap<>();
+		LinkedHashMap<String, Map<String, Object>> data = new LinkedHashMap<>();
 
 		// This is an ordered stream, and it means that non-profile-based sources will be
 		// processed before profile-based sources.
@@ -212,7 +197,6 @@ public static MultipleSourcesContainer processNamedData(List<StrippedSourceConta
 			StrippedSourceContainer stripped = hashByName.get(sourceName);
 			if (stripped != null) {
 				LOG.debug("Found source with name : '" + sourceName + "' in namespace: '" + namespace + "'");
-				foundSourceNames.add(sourceName);
 				// see if data is a single yaml/properties file and if it needs decoding
 				Map<String, String> rawData = stripped.data();
 				if (decode) {
@@ -228,7 +212,7 @@ public static MultipleSourcesContainer processNamedData(List<StrippedSourceConta
 				 */
 				if (processSource(includeDefaultProfileData, environment, sourceName, rawData)) {
 					Map<String, Object> processedData = SourceDataEntriesProcessor.processAllEntries(
-							rawData == null ? Map.of() : rawData, environment, includeDefaultProfileData);
+						rawData == null ? Map.of() : rawData, environment, includeDefaultProfileData);
 					data.put(sourceName, processedData);
 				}
 			}
@@ -237,11 +221,11 @@ public static MultipleSourcesContainer processNamedData(List<StrippedSourceConta
 			}
 		});
 
-		return new MultipleSourcesContainer(foundSourceNames, data);
+		return new MultipleSourcesContainer(data);
 	}
 
 	static boolean processSource(boolean includeDefaultProfileData, Environment environment, String sourceName,
-			Map<String, String> sourceRawData) {
+		Map<String, String> sourceRawData) {
 		List<String> activeProfiles = Arrays.stream(environment.getActiveProfiles()).toList();
 
 		boolean emptyActiveProfiles = activeProfiles.isEmpty();
@@ -252,7 +236,7 @@ static boolean processSource(boolean includeDefaultProfileData, Environment envi
 		boolean defaultProfilePresent = activeProfiles.contains("default");
 
 		return includeDefaultProfileData || emptyActiveProfiles || profileBasedSourceName || defaultProfilePresent
-				|| rawDataContainsProfileBasedSource(activeProfiles, sourceRawData).getAsBoolean();
+			|| rawDataContainsProfileBasedSource(activeProfiles, sourceRawData).getAsBoolean();
 	}
 
 	/*
@@ -264,7 +248,7 @@ static boolean processSource(boolean includeDefaultProfileData, Environment envi
 	 * yaml/yml/properties. For example: 'account-k8s.yaml' or the like.
 	 */
 	static BooleanSupplier rawDataContainsProfileBasedSource(List<String> activeProfiles,
-			Map<String, String> sourceRawData) {
+		Map<String, String> sourceRawData) {
 		return () -> Optional.ofNullable(sourceRawData)
 			.orElse(Map.of())
 			.keySet()
@@ -273,7 +257,7 @@ static BooleanSupplier rawDataContainsProfileBasedSource(List<String> activeProf
 				.anyMatch(activeProfile -> ENDS_WITH_PROFILE_AND_EXTENSION.test(keyName, activeProfile)));
 	}
 
-	static String sourceDataName(String target, LinkedHashSet<String> sourceNames, String namespace) {
+	static String sourceDataName(String target, Set<String> sourceNames, String namespace) {
 		String sortedNames = sourceNames.stream().sorted().collect(Collectors.joining(PROPERTY_SOURCE_NAME_SEPARATOR));
 		return sourceName(target, sortedNames, namespace);
 	}
@@ -285,8 +269,8 @@ static String sourceDataName(String target, LinkedHashSet<String> sourceNames, S
 	 * these names to find any profile-based sources.
 	 */
 	public static MultipleSourcesContainer processLabeledData(List<StrippedSourceContainer> containers,
-			Environment environment, Map<String, String> labels, String namespace, Set<String> profiles,
-			boolean decode) {
+		Environment environment, Map<String, String> labels, String namespace, Set<String> profiles,
+		boolean decode) {
 
 		// find sources by provided labels
 		List<StrippedSourceContainer> byLabels = containers.stream().filter(one -> {
@@ -318,13 +302,11 @@ public static MultipleSourcesContainer processLabeledData(List<StrippedSourceCon
 		all.addAll(byLabels);
 		all.addAll(byProfile);
 
-		LinkedHashSet<String> sourceNames = new LinkedHashSet<>();
-		Map<String, Object> data = new HashMap<>();
+		LinkedHashMap<String, Map<String, Object>> data = new LinkedHashMap<>();
 
 		all.forEach(source -> {
 			String foundSourceName = source.name();
 			LOG.debug("Loaded source with name : '" + foundSourceName + " in namespace: '" + namespace + "'");
-			sourceNames.add(foundSourceName);
 
 			Map<String, String> rawData = source.data();
 			if (decode) {
@@ -335,7 +317,7 @@ public static MultipleSourcesContainer processLabeledData(List<StrippedSourceCon
 			data.put(foundSourceName, dataFromOneSource);
 		});
 
-		return new MultipleSourcesContainer(sourceNames, data);
+		return new MultipleSourcesContainer(data);
 	}
 
 	private static Map<String, String> decodeData(Map<String, String> data) {
@@ -345,7 +327,7 @@ private static Map<String, String> decodeData(Map<String, String> data) {
 	}
 
 	public static <T> void registerSingle(ConfigurableBootstrapContext bootstrapContext, Class<T> cls, T instance,
-			String name, ApplicationListener<?> listener) {
+		String name, ApplicationListener<?> listener) {
 		bootstrapContext.registerIfAbsent(cls, BootstrapRegistry.InstanceSupplier.of(instance));
 		bootstrapContext.addCloseListener(event -> {
 
@@ -359,7 +341,7 @@ public static <T> void registerSingle(ConfigurableBootstrapContext bootstrapCont
 	}
 
 	public static <T> void registerSingle(ConfigurableBootstrapContext bootstrapContext, Class<T> cls, T instance,
-			String name) {
+		String name) {
 		registerSingle(bootstrapContext, cls, instance, name, NO_OP);
 	}
 

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/LabeledSourceData.java

@@ -17,7 +17,7 @@
 package org.springframework.cloud.kubernetes.commons.config;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -46,7 +46,7 @@ public abstract class LabeledSourceData {
 	private static final Log LOG = LogFactory.getLog(LabeledSourceData.class);
 
 	public final SourceData compute(Map<String, String> labels, Prefix prefix, String target, boolean profileSources,
-			boolean failFast, String namespace, String[] activeProfiles) {
+		boolean failFast, String namespace, String[] activeProfiles) {
 
 		MultipleSourcesContainer data = MultipleSourcesContainer.empty();
 		String sourceDataName;
@@ -57,34 +57,33 @@ public final SourceData compute(Map<String, String> labels, Prefix prefix, Strin
 				profiles = Arrays.stream(activeProfiles).collect(Collectors.toSet());
 			}
 			data = dataSupplier(labels, profiles);
+			LinkedHashMap<String, Map<String, Object>> sourceData = data.data();
+			sourceDataName = sourceDataName(target, sourceData.keySet(), namespace);
 
-			LinkedHashSet<String> sourceNames = data.names();
-			Map<String, Object> sourceDataForSourceName = data.data();
-			sourceDataName = sourceDataName(target, sourceNames, namespace);
-
-			if (sourceNames.isEmpty()) {
+			if (sourceData.isEmpty()) {
 				return emptySourceData(labels, target, namespace);
 			}
 
 			if (prefix.getName().equals(Prefix.DEFAULT.getName())) {
-				return new SourceData(sourceDataName, defaultFlattenedSourceData(sourceNames, sourceDataForSourceName));
+				return new SourceData(sourceDataName, defaultFlattenedSourceData(sourceData));
 			}
 
 			if (prefix.getName().equals(Prefix.KNOWN.getName())) {
 				return new SourceData(sourceDataName,
-						prefixFlattenedSourceData(sourceNames, sourceDataForSourceName, prefix.prefixProvider().get()));
+					prefixFlattenedSourceData(sourceData, prefix.prefixProvider().get()));
 			}
 
 			if (prefix.getName().equals(Prefix.DELAYED.getName())) {
-				return new SourceData(sourceDataName, nameFlattenedSourceData(sourceNames, sourceDataForSourceName));
+				return new SourceData(sourceDataName, nameFlattenedSourceData(sourceData));
 			}
 
 			throw new IllegalArgumentException("Unsupported prefix: " + prefix);
 		}
 		catch (Exception e) {
 			LOG.warn("Failure in reading labeled sources");
 			onException(failFast, e);
-			return new SourceData(sourceDataName(target, data.names(), namespace), Map.of(ERROR_PROPERTY, "true"));
+			return new SourceData(sourceDataName(target, data.data().keySet(), namespace),
+				Map.of(ERROR_PROPERTY, "true"));
 		}
 
 	}
@@ -98,7 +97,7 @@ private SourceData emptySourceData(Map<String, String> labels, String target, St
 			.stream()
 			.sorted()
 			.collect(Collectors.collectingAndThen(Collectors.joining(PROPERTY_SOURCE_NAME_SEPARATOR),
-					sortedLabels -> sourceName(target, sortedLabels, namespace)));
+				sortedLabels -> sourceName(target, sortedLabels, namespace)));
 
 		return SourceData.emptyRecord(sourceName);
 	}

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/MultipleSourcesContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-present the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.kubernetes.commons.config;
 
-import java.util.LinkedHashSet;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
@@ -25,10 +25,9 @@
  * Container that stores multiple sources, to be exact their names and their flattenned
  * data. We force a LinkedHashSet on purpose, to preserve the order of sources.
  */
-public record MultipleSourcesContainer(LinkedHashSet<String> names, Map<String, Object> data) {
+public record MultipleSourcesContainer(LinkedHashMap<String, Map<String, Object>> data) {
 
-	private static final MultipleSourcesContainer EMPTY = new MultipleSourcesContainer(new LinkedHashSet<>(0),
-			Map.of());
+	private static final MultipleSourcesContainer EMPTY = new MultipleSourcesContainer(new LinkedHashMap<>(0));
 
 	public static MultipleSourcesContainer empty() {
 		return EMPTY;

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/NamedSourceData.java

@@ -16,8 +16,10 @@
 
 package org.springframework.cloud.kubernetes.commons.config;
 
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.commons.logging.Log;
@@ -43,7 +45,7 @@ public abstract class NamedSourceData {
 	private static final Log LOG = LogFactory.getLog(NamedSourceData.class);
 
 	public final SourceData compute(String sourceName, Prefix prefix, String target, boolean profileSources,
-			boolean failFast, String namespace, String[] activeProfiles) {
+		boolean failFast, String namespace, String[] activeProfiles) {
 
 		// first comes a non-profile-based source
 		LinkedHashSet<String> sourceNamesToSearchFor = new LinkedHashSet<>();
@@ -60,31 +62,29 @@ public final SourceData compute(String sourceName, Prefix prefix, String target,
 			}
 
 			data = dataSupplier(sourceNamesToSearchFor);
-			Map<String, Object> sourceDataForSourceName = data.data();
-			LinkedHashSet<String> sourceNamesFound = data.names();
-			String sortedNames = data.names()
-				.stream()
+			LinkedHashMap<String, Map<String, Object>> sourceData = data.data();
+
+			Set<String> sourceNamesFound = sourceData.keySet();
+			String sortedNames = sourceNamesFound.stream()
 				.sorted()
 				.collect(Collectors.joining(PROPERTY_SOURCE_NAME_SEPARATOR));
 			sourceDataName = generateSourceName(target, sortedNames, namespace, activeProfiles);
 
-			if (data.names().isEmpty()) {
+			if (sourceData.isEmpty()) {
 				return emptySourceData(target, sourceName, namespace);
 			}
 
 			if (prefix.getName().equals(Prefix.DEFAULT.getName())) {
-				return new SourceData(sourceDataName,
-						defaultFlattenedSourceData(sourceNamesFound, sourceDataForSourceName));
+				return new SourceData(sourceDataName, defaultFlattenedSourceData(sourceData));
 			}
 
 			if (prefix.getName().equals(Prefix.KNOWN.getName())) {
-				return new SourceData(sourceDataName, prefixFlattenedSourceData(sourceNamesFound,
-						sourceDataForSourceName, prefix.prefixProvider().get()));
+				return new SourceData(sourceDataName,
+					prefixFlattenedSourceData(sourceData, prefix.prefixProvider().get()));
 			}
 
 			if (prefix.getName().equals(Prefix.DELAYED.getName())) {
-				return new SourceData(sourceDataName,
-						nameFlattenedSourceData(sourceNamesFound, sourceDataForSourceName));
+				return new SourceData(sourceDataName, nameFlattenedSourceData(sourceData));
 			}
 
 			throw new IllegalArgumentException("Unsupported prefix: " + prefix);
@@ -93,9 +93,13 @@ public final SourceData compute(String sourceName, Prefix prefix, String target,
 		catch (Exception e) {
 			LOG.warn("Failure in reading named sources");
 			onException(failFast, e);
-			String names = data.names().stream().sorted().collect(Collectors.joining(PROPERTY_SOURCE_NAME_SEPARATOR));
+			String names = data.data()
+				.keySet()
+				.stream()
+				.sorted()
+				.collect(Collectors.joining(PROPERTY_SOURCE_NAME_SEPARATOR));
 			return new SourceData(generateSourceName(target, names, namespace, activeProfiles),
-					Map.of(ERROR_PROPERTY, "true"));
+				Map.of(ERROR_PROPERTY, "true"));
 		}
 
 	}