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

.github/workflows/composites/pre-test-actions/action.yaml

@@ -24,7 +24,7 @@ runs:
     - name: build project
       shell: bash
       run: |
-        ./mvnw clean install -Dskip.build.image=true -DskipITs -DskipTests -T1C -U -B -q  
+        ./mvnw clean install -P 'run-on-github-actions' -Dskip.build.image=true -DskipITs -DskipTests -T1C -U -B -q  
 
     - name: build controllers project
       uses: ./.github/workflows/composites/build-controllers-project

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

@@ -24,17 +24,16 @@
 import org.springframework.boot.context.config.ConfigDataLocation;
 import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
 import org.springframework.boot.context.config.Profiles;
-import org.springframework.boot.logging.DeferredLogFactory;
 import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.config.ConfigDataRetryableConfigMapPropertySourceLocator;
 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;
@@ -44,17 +43,12 @@
  */
 public class KubernetesClientConfigDataLocationResolver extends KubernetesConfigDataLocationResolver {
 
-	public KubernetesClientConfigDataLocationResolver(DeferredLogFactory factory) {
-		super(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);
@@ -96,8 +90,4 @@ private CoreV1Api registerClientAndCoreV1Api(ConfigurableBootstrapContext bootst
 		return coreV1Api;
 	}
 
-	protected KubernetesNamespaceProvider kubernetesNamespaceProvider(Environment environment) {
-		return new KubernetesNamespaceProvider(environment);
-	}
-
 }

spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigDataLocationResolverTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.cloud.kubernetes.client.config;
 
-import java.util.function.Supplier;
-
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import org.junit.jupiter.api.Assertions;
@@ -31,7 +29,6 @@
 import org.springframework.boot.context.config.Profiles;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.boot.context.properties.source.ConfigurationPropertySources;
-import org.springframework.boot.logging.DeferredLogFactory;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties;
@@ -49,13 +46,10 @@
 @ExtendWith(OutputCaptureExtension.class)
 class KubernetesClientConfigDataLocationResolverTests {
 
-	private static final DeferredLogFactory FACTORY = Supplier::get;
-
 	private static final ConfigDataLocationResolverContext RESOLVER_CONTEXT = Mockito
 		.mock(ConfigDataLocationResolverContext.class);
 
-	private static final KubernetesClientConfigDataLocationResolver RESOLVER = new KubernetesClientConfigDataLocationResolver(
-			FACTORY);
+	private static final KubernetesClientConfigDataLocationResolver RESOLVER = new KubernetesClientConfigDataLocationResolver();
 
 	/*
 	 * both ConfigMapConfigProperties and SecretsConfigProperties are null, thus they are

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

@@ -0,0 +1,67 @@
+/*
+ * 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");
+
+		if (configMapProperties != null) {
+			registerSingle(bootstrapContext, ConfigMapConfigProperties.class, configMapProperties,
+				"configDataConfigMapConfigProperties");
+		}
+
+		if (secretsProperties != null) {
+			registerSingle(bootstrapContext, SecretsConfigProperties.class, secretsProperties,
+				"configDataSecretsConfigProperties");
+		}
+
+	}
+
+	@FunctionalInterface
+	interface Registrar {
+
+		ConfigDataProperties register();
+
+	}
+}