Simplify config data code a bit (CAN ONLY GO IN THE NEXT MAJOR RELEASE)

spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigDataLocationResolver.java

@@ -30,10 +30,10 @@
 import org.springframework.cloud.kubernetes.commons.config.ConfigDataRetryableSecretsPropertySourceLocator;
 import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
 import org.springframework.cloud.kubernetes.commons.config.ConfigMapPropertySourceLocator;
-import org.springframework.cloud.kubernetes.commons.config.KubernetesConfigDataLocationResolver;
 import org.springframework.cloud.kubernetes.commons.config.SecretsConfigProperties;
 import org.springframework.cloud.kubernetes.commons.config.SecretsPropertySourceLocator;
-import org.springframework.core.env.Environment;
+import org.springframework.cloud.kubernetes.commons.config.configdata.ConfigDataProperties;
+import org.springframework.cloud.kubernetes.commons.config.configdata.KubernetesConfigDataLocationResolver;
 
 import static org.springframework.cloud.kubernetes.client.KubernetesClientUtils.kubernetesApiClient;
 import static org.springframework.cloud.kubernetes.commons.config.ConfigUtils.registerSingle;
@@ -49,11 +49,10 @@ public KubernetesClientConfigDataLocationResolver(DeferredLogFactory factory) {
 
 	@Override
 	protected void registerBeans(ConfigDataLocationResolverContext resolverContext, ConfigDataLocation location,
-			Profiles profiles, KubernetesConfigDataLocationResolver.PropertyHolder propertyHolder,
-			KubernetesNamespaceProvider namespaceProvider) {
-		KubernetesClientProperties kubernetesClientProperties = propertyHolder.kubernetesClientProperties();
-		ConfigMapConfigProperties configMapProperties = propertyHolder.configMapConfigProperties();
-		SecretsConfigProperties secretsProperties = propertyHolder.secretsProperties();
+			Profiles profiles, ConfigDataProperties properties, KubernetesNamespaceProvider namespaceProvider) {
+		KubernetesClientProperties kubernetesClientProperties = properties.clientProperties();
+		ConfigMapConfigProperties configMapProperties = properties.configMapProperties();
+		SecretsConfigProperties secretsProperties = properties.secretsProperties();
 
 		ConfigurableBootstrapContext bootstrapContext = resolverContext.getBootstrapContext();
 		CoreV1Api coreV1Api = registerClientAndCoreV1Api(bootstrapContext, kubernetesClientProperties);
@@ -95,8 +94,4 @@ private CoreV1Api registerClientAndCoreV1Api(ConfigurableBootstrapContext bootst
 		return coreV1Api;
 	}
 
-	protected KubernetesNamespaceProvider kubernetesNamespaceProvider(Environment environment) {
-		return new KubernetesNamespaceProvider(environment);
-	}
-
 }

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

@@ -271,9 +271,11 @@ private static Map<String, String> decodeData(Map<String, String> data) {
 
 	public static <T> void registerSingle(ConfigurableBootstrapContext bootstrapContext, Class<T> cls, T instance,
 			String name) {
-		bootstrapContext.registerIfAbsent(cls, BootstrapRegistry.InstanceSupplier.of(instance));
-		bootstrapContext.addCloseListener(event -> event.getApplicationContext().getBeanFactory()
-				.registerSingleton(name, event.getBootstrapContext().get(cls)));
+		if (instance != null && !bootstrapContext.isRegistered(cls)) {
+			bootstrapContext.register(cls, BootstrapRegistry.InstanceSupplier.of(instance));
+			bootstrapContext.addCloseListener(event -> event.getApplicationContext().getBeanFactory()
+					.registerSingleton(name, event.getBootstrapContext().get(cls)));
+		}
 	}
 
 	public static final class Prefix {

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

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2013-2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.commons.config.configdata;
+
+import org.springframework.boot.ConfigurableBootstrapContext;
+import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
+import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties;
+import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
+import org.springframework.cloud.kubernetes.commons.config.SecretsConfigProperties;
+
+import static org.springframework.cloud.kubernetes.commons.config.ConfigUtils.registerSingle;
+
+public record ConfigDataProperties(KubernetesClientProperties clientProperties,
+		ConfigMapConfigProperties configMapProperties, SecretsConfigProperties secretsProperties) {
+
+	static Registrar of(ConfigDataLocationResolverContext context) {
+		Properties all = Properties.of(context);
+		return () -> {
+			registerProperties(context, all.clientProperties(), all.configMapProperties(),
+					all.secretsConfigProperties());
+			return new ConfigDataProperties(all.clientProperties(), all.configMapProperties(),
+					all.secretsConfigProperties());
+		};
+	}
+
+	private static void registerProperties(ConfigDataLocationResolverContext resolverContext,
+			KubernetesClientProperties clientProperties, ConfigMapConfigProperties configMapProperties,
+			SecretsConfigProperties secretsProperties) {
+
+		ConfigurableBootstrapContext bootstrapContext = resolverContext.getBootstrapContext();
+		registerSingle(bootstrapContext, KubernetesClientProperties.class, clientProperties,
+				"configDataKubernetesClientProperties");
+
+		registerSingle(bootstrapContext, ConfigMapConfigProperties.class, configMapProperties,
+				"configDataConfigMapConfigProperties");
+
+		registerSingle(bootstrapContext, SecretsConfigProperties.class, secretsProperties,
+				"configDataSecretsConfigProperties");
+	}
+
+	@FunctionalInterface
+	interface Registrar {
+
+		ConfigDataProperties register();
+
+	}
+}

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/KubernetesConfigDataLoader.java → spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/configdata/KubernetesConfigDataLoader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.kubernetes.commons.config;
+package org.springframework.cloud.kubernetes.commons.config.configdata;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -26,6 +26,8 @@
 import org.springframework.boot.context.config.ConfigDataLoader;
 import org.springframework.boot.context.config.ConfigDataLoaderContext;
 import org.springframework.boot.context.config.ConfigDataResourceNotFoundException;
+import org.springframework.cloud.kubernetes.commons.config.ConfigMapPropertySourceLocator;
+import org.springframework.cloud.kubernetes.commons.config.SecretsPropertySourceLocator;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;