Merge pull request #2029 from wind57/drop_overlapping_methods

Author: ryanjbaxter

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

@@ -169,11 +169,6 @@ public static String sourceName(String target, String applicationName, String na
 		return name;
 	}
 
-	public static MultipleSourcesContainer processNamedData(List<StrippedSourceContainer> strippedSources,
-			Environment environment, LinkedHashSet<String> sourceNames, String namespace, boolean decode) {
-		return processNamedData(strippedSources, environment, sourceNames, namespace, decode, true);
-	}
-
 	/**
 	 * Transforms raw data from one or multiple sources into an entry of source names and
 	 * flattened data that they all hold (potentially overriding entries without any

spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtilsTests.java

@@ -162,7 +162,7 @@ void testMerge() {
 			.collect(Collectors.toCollection(LinkedHashSet::new));
 
 		MultipleSourcesContainer result = ConfigUtils.processNamedData(List.of(configMapOne, configMapOneK8s),
-				new MockEnvironment(), sourceNames, "default", false);
+				new MockEnvironment(), sourceNames, "default", false, true);
 
 		Assertions.assertThat(result.data().size()).isEqualTo(2);
 		Map<String, Object> one = result.data().get("configmap-one");

spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigUtils.java

@@ -107,7 +107,7 @@ static MultipleSourcesContainer secretsDataByName(KubernetesClient client, Strin
 		if (strippedSecrets.isEmpty()) {
 			return MultipleSourcesContainer.empty();
 		}
-		return ConfigUtils.processNamedData(strippedSecrets, environment, sourceNames, namespace, true);
+		return ConfigUtils.processNamedData(strippedSecrets, environment, sourceNames, namespace, true, true);
 	}
 
 	/**
@@ -124,7 +124,7 @@ static MultipleSourcesContainer configMapsDataByName(KubernetesClient client, St
 		if (strippedConfigMaps.isEmpty()) {
 			return MultipleSourcesContainer.empty();
 		}
-		return ConfigUtils.processNamedData(strippedConfigMaps, environment, sourceNames, namespace, false);
+		return ConfigUtils.processNamedData(strippedConfigMaps, environment, sourceNames, namespace, false, true);
 	}
 
 	private static List<StrippedSourceContainer> strippedConfigMaps(KubernetesClient client, String namespace) {