dirty

wind57 · wind57 · commit 2ff03daccd7c · 2024-09-23T11:00:28.000+03:00
diff --git a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/NamedConfigMapContextToSourceDataProvider.java b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/NamedConfigMapContextToSourceDataProvider.java
@@ -45,11 +45,11 @@ public KubernetesClientContextToSourceData get() {
 			return new NamedSourceData() {
 				@Override
 				protected String generateSourceName(String target, String sourceName, String namespace,
-						String[] activeProfiles, boolean namespacedBatchRead) {
+						String[] activeProfiles) {
 					if (source.appendProfileToName()) {
 						return ConfigUtils.sourceName(target, sourceName, namespace, activeProfiles);
 					}
-					return super.generateSourceName(target, sourceName, namespace, activeProfiles, namespacedBatchRead);
+					return super.generateSourceName(target, sourceName, namespace, activeProfiles);
 				}
 
 				@Override
@@ -58,8 +58,7 @@ public MultipleSourcesContainer dataSupplier(LinkedHashSet<String> sourceNames)
 							sourceNames, context.environment(), context.namespacedBatchRead());
 				}
 			}.compute(source.name().orElseThrow(), source.prefix(), source.target(), source.profileSpecificSources(),
-					source.failFast(), context.namespace(), context.environment().getActiveProfiles(),
-					context.namespacedBatchRead());
+					source.failFast(), context.namespace(), context.environment().getActiveProfiles());
 		};
 
 	}
diff --git a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/NamedSecretContextToSourceDataProvider.java b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/NamedSecretContextToSourceDataProvider.java
@@ -44,22 +44,20 @@ public KubernetesClientContextToSourceData get() {
 			return new NamedSourceData() {
 				@Override
 				protected String generateSourceName(String target, String sourceName, String namespace,
-						String[] activeProfiles, boolean namesspacedBatchRead) {
+						String[] activeProfiles) {
 					if (source.appendProfileToName()) {
 						return ConfigUtils.sourceName(target, sourceName, namespace, activeProfiles);
 					}
-					return super.generateSourceName(target, sourceName, namespace, activeProfiles,
-							namesspacedBatchRead);
+					return super.generateSourceName(target, sourceName, namespace, activeProfiles);
 				}
 
 				@Override
 				public MultipleSourcesContainer dataSupplier(LinkedHashSet<String> sourceNames) {
 					return KubernetesClientConfigUtils.secretsDataByName(context.client(), context.namespace(),
-							sourceNames, context.environment(), context.includeDefaultProfileData());
+							sourceNames, context.environment(), context.namespacedBatchRead());
 				}
 			}.compute(source.name().orElseThrow(), source.prefix(), source.target(), source.profileSpecificSources(),
-					source.failFast(), context.namespace(), context.environment().getActiveProfiles(),
-					context.namespacedBatchRead());
+					source.failFast(), context.namespace(), context.environment().getActiveProfiles());
 		};
 	}
 
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/NamedConfigMapContextToSourceDataProviderTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/NamedConfigMapContextToSourceDataProviderTests.java
@@ -173,7 +173,7 @@ void matchIncludeSingleProfile() {
 		MockEnvironment environment = new MockEnvironment();
 		environment.setActiveProfiles("with-profile");
 		KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, environment,
-				true, NAMESPACED_BATCH_READ);
+				false, NAMESPACED_BATCH_READ);
 
 		KubernetesClientContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get();
 		SourceData sourceData = data.apply(context);
diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/LabeledSourceData.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/LabeledSourceData.java
@@ -80,8 +80,6 @@ public final SourceData compute(Map<String, String> labels, ConfigUtils.Prefix p
 	 * Implementation specific (fabric8 or k8s-native) way to get the data from then given
 	 * source names.
 	 * @param labels the ones that have been configured
-	 * @param profiles profiles to taken into account when gathering source data. Can be
-	 * empty.
 	 * @return a container that holds the names of the source that were found and their
 	 * data
 	 */
diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/NamedSourceData.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/NamedSourceData.java
@@ -32,7 +32,7 @@
 public abstract class NamedSourceData {
 
 	public final SourceData compute(String sourceName, ConfigUtils.Prefix prefix, String target, boolean profileSources,
-			boolean failFast, String namespace, String[] activeProfiles, boolean namespacedBatchRead) {
+			boolean failFast, String namespace, String[] activeProfiles) {
 
 		LinkedHashSet<String> sourceNames = new LinkedHashSet<>();
 		// first comes non-profile based source
@@ -67,12 +67,10 @@ public final SourceData compute(String sourceName, ConfigUtils.Prefix prefix, St
 		}
 
 		String names = data.names().stream().sorted().collect(Collectors.joining(PROPERTY_SOURCE_NAME_SEPARATOR));
-		return new SourceData(generateSourceName(target, names, namespace, activeProfiles, namespacedBatchRead),
-				data.data());
+		return new SourceData(generateSourceName(target, names, namespace, activeProfiles), data.data());
 	}
 
-	protected String generateSourceName(String target, String sourceName, String namespace, String[] activeProfiles,
-			boolean namespacedBatchRead) {
+	protected String generateSourceName(String target, String sourceName, String namespace, String[] activeProfile) {
 		return ConfigUtils.sourceName(target, sourceName, namespace);
 	}
 
diff --git a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/NamedConfigMapContextToSourceDataProvider.java b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/NamedConfigMapContextToSourceDataProvider.java
@@ -53,11 +53,11 @@ public Fabric8ContextToSourceData get() {
 
 				@Override
 				protected String generateSourceName(String target, String sourceName, String namespace,
-						String[] activeProfiles, boolean namespacedBatchRead) {
+						String[] activeProfiles) {
 					if (source.appendProfileToName()) {
 						return ConfigUtils.sourceName(target, sourceName, namespace, activeProfiles);
 					}
-					return super.generateSourceName(target, sourceName, namespace, activeProfiles, namespacedBatchRead);
+					return super.generateSourceName(target, sourceName, namespace, activeProfiles);
 				}
 
 				@Override
@@ -66,8 +66,7 @@ public MultipleSourcesContainer dataSupplier(LinkedHashSet<String> sourceNames)
 							context.environment(), context.namespacedBatchRead());
 				}
 			}.compute(source.name().orElseThrow(), source.prefix(), source.target(), source.profileSpecificSources(),
-					source.failFast(), context.namespace(), context.environment().getActiveProfiles(),
-					context.namespacedBatchRead());
+					source.failFast(), context.namespace(), context.environment().getActiveProfiles());
 		};
 
 	}
diff --git a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/NamedSecretContextToSourceDataProvider.java b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/NamedSecretContextToSourceDataProvider.java
@@ -43,11 +43,11 @@ public Fabric8ContextToSourceData get() {
 			return new NamedSourceData() {
 				@Override
 				protected String generateSourceName(String target, String sourceName, String namespace,
-						String[] activeProfiles, boolean namespacedBatchRead) {
+						String[] activeProfiles) {
 					if (source.appendProfileToName()) {
 						return ConfigUtils.sourceName(target, sourceName, namespace, activeProfiles);
 					}
-					return super.generateSourceName(target, sourceName, namespace, activeProfiles, namespacedBatchRead);
+					return super.generateSourceName(target, sourceName, namespace, activeProfiles);
 				}
 
 				@Override
@@ -56,8 +56,7 @@ public MultipleSourcesContainer dataSupplier(LinkedHashSet<String> sourceNames)
 							context.environment(), context.namespacedBatchRead());
 				}
 			}.compute(source.name().orElseThrow(), source.prefix(), source.target(), source.profileSpecificSources(),
-					source.failFast(), context.namespace(), context.environment().getActiveProfiles(),
-					context.namespacedBatchRead());
+					source.failFast(), context.namespace(), context.environment().getActiveProfiles());
 		};
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,11 @@ public KubernetesClientContextToSourceData get() {`
`45`	`45`	`return new NamedSourceData() {`
`46`	`46`	`@Override`
`47`	`47`	`protected String generateSourceName(String target, String sourceName, String namespace,`
`48`		`- String[] activeProfiles, boolean namespacedBatchRead) {`
	`48`	`+ String[] activeProfiles) {`
`49`	`49`	`if (source.appendProfileToName()) {`
`50`	`50`	`return ConfigUtils.sourceName(target, sourceName, namespace, activeProfiles);`
`51`	`51`	`}`
`52`		`- return super.generateSourceName(target, sourceName, namespace, activeProfiles, namespacedBatchRead);`
	`52`	`+ return super.generateSourceName(target, sourceName, namespace, activeProfiles);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
`@@ -58,8 +58,7 @@ public MultipleSourcesContainer dataSupplier(LinkedHashSet<String> sourceNames)`
`58`	`58`	`sourceNames, context.environment(), context.namespacedBatchRead());`
`59`	`59`	`}`
`60`	`60`	`}.compute(source.name().orElseThrow(), source.prefix(), source.target(), source.profileSpecificSources(),`
`61`		`- source.failFast(), context.namespace(), context.environment().getActiveProfiles(),`
`62`		`- context.namespacedBatchRead());`
	`61`	`+ source.failFast(), context.namespace(), context.environment().getActiveProfiles());`
`63`	`62`	`};`
`64`	`63`
`65`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`public abstract class NamedSourceData {`
`33`	`33`
`34`	`34`	`public final SourceData compute(String sourceName, ConfigUtils.Prefix prefix, String target, boolean profileSources,`
`35`		`- boolean failFast, String namespace, String[] activeProfiles, boolean namespacedBatchRead) {`
	`35`	`+ boolean failFast, String namespace, String[] activeProfiles) {`
`36`	`36`
`37`	`37`	`LinkedHashSet<String> sourceNames = new LinkedHashSet<>();`
`38`	`38`	`// first comes non-profile based source`
`@@ -67,12 +67,10 @@ public final SourceData compute(String sourceName, ConfigUtils.Prefix prefix, St`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`String names = data.names().stream().sorted().collect(Collectors.joining(PROPERTY_SOURCE_NAME_SEPARATOR));`
`70`		`- return new SourceData(generateSourceName(target, names, namespace, activeProfiles, namespacedBatchRead),`
`71`		`- data.data());`
	`70`	`+ return new SourceData(generateSourceName(target, names, namespace, activeProfiles), data.data());`
`72`	`71`	`}`
`73`	`72`
`74`		`- protected String generateSourceName(String target, String sourceName, String namespace, String[] activeProfiles,`
`75`		`- boolean namespacedBatchRead) {`
	`73`	`+ protected String generateSourceName(String target, String sourceName, String namespace, String[] activeProfile) {`
`76`	`74`	`return ConfigUtils.sourceName(target, sourceName, namespace);`
`77`	`75`	`}`
`78`	`76`
Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,11 @@ public Fabric8ContextToSourceData get() {`
`53`	`53`
`54`	`54`	`@Override`
`55`	`55`	`protected String generateSourceName(String target, String sourceName, String namespace,`
`56`		`- String[] activeProfiles, boolean namespacedBatchRead) {`
	`56`	`+ String[] activeProfiles) {`
`57`	`57`	`if (source.appendProfileToName()) {`
`58`	`58`	`return ConfigUtils.sourceName(target, sourceName, namespace, activeProfiles);`
`59`	`59`	`}`
`60`		`- return super.generateSourceName(target, sourceName, namespace, activeProfiles, namespacedBatchRead);`
	`60`	`+ return super.generateSourceName(target, sourceName, namespace, activeProfiles);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`@Override`
`@@ -66,8 +66,7 @@ public MultipleSourcesContainer dataSupplier(LinkedHashSet<String> sourceNames)`
`66`	`66`	`context.environment(), context.namespacedBatchRead());`
`67`	`67`	`}`
`68`	`68`	`}.compute(source.name().orElseThrow(), source.prefix(), source.target(), source.profileSpecificSources(),`
`69`		`- source.failFast(), context.namespace(), context.environment().getActiveProfiles(),`
`70`		`- context.namespacedBatchRead());`
	`69`	`+ source.failFast(), context.namespace(), context.environment().getActiveProfiles());`
`71`	`70`	`};`
`72`	`71`
`73`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,11 @@ public Fabric8ContextToSourceData get() {`
`43`	`43`	`return new NamedSourceData() {`
`44`	`44`	`@Override`
`45`	`45`	`protected String generateSourceName(String target, String sourceName, String namespace,`
`46`		`- String[] activeProfiles, boolean namespacedBatchRead) {`
	`46`	`+ String[] activeProfiles) {`
`47`	`47`	`if (source.appendProfileToName()) {`
`48`	`48`	`return ConfigUtils.sourceName(target, sourceName, namespace, activeProfiles);`
`49`	`49`	`}`
`50`		`- return super.generateSourceName(target, sourceName, namespace, activeProfiles, namespacedBatchRead);`
	`50`	`+ return super.generateSourceName(target, sourceName, namespace, activeProfiles);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@Override`
`@@ -56,8 +56,7 @@ public MultipleSourcesContainer dataSupplier(LinkedHashSet<String> sourceNames)`
`56`	`56`	`context.environment(), context.namespacedBatchRead());`
`57`	`57`	`}`
`58`	`58`	`}.compute(source.name().orElseThrow(), source.prefix(), source.target(), source.profileSpecificSources(),`
`59`		`- source.failFast(), context.namespace(), context.environment().getActiveProfiles(),`
`60`		`- context.namespacedBatchRead());`
	`59`	`+ source.failFast(), context.namespace(), context.environment().getActiveProfiles());`
`61`	`60`	`};`
`62`	`61`	`}`
`63`	`62`