Fixes config data log constructor.

Also, compatibility with framework 6/boot 3

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

@@ -36,6 +36,7 @@ import org.springframework.boot.context.properties.PropertyMapper;
 import org.springframework.boot.context.properties.bind.BindHandler;
 import org.springframework.boot.context.properties.bind.Bindable;
 import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.boot.logging.DeferredLogFactory;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.core.Ordered;
 import org.springframework.core.log.LogMessage;
@@ -55,8 +56,8 @@ public class ConfigServerConfigDataLocationResolver
 
 	private final Log log;
 
-	public ConfigServerConfigDataLocationResolver(Log log) {
-		this.log = log;
+	public ConfigServerConfigDataLocationResolver(DeferredLogFactory factory) {
+		this.log = factory.getLog(ConfigServerConfigDataLocationResolver.class);
 	}
 
 	@Override

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

@@ -110,7 +110,7 @@ public class ConfigServerConfigDataLoaderTests {
 		MockitoAnnotations.openMocks(this);
 
 		environment = new StandardEnvironment();
-		loader = new ConfigServerConfigDataLoader(logger);
+		loader = new ConfigServerConfigDataLoader(destination -> logger);
 		restTemplate = mock(RestTemplate.class);
 		context = mock(ConfigDataLoaderContext.class);
 		bootstrapContext = mock(ConfigurableBootstrapContext.class);
@@ -347,7 +347,7 @@ public class ConfigServerConfigDataLoaderTests {
 		properties.setUri(uris);
 		properties.setFailFast(true);
 		properties.setMultipleUriStrategy(ConfigClientProperties.MultipleUriStrategy.ALWAYS);
-		this.loader = new ConfigServerConfigDataLoader(logger);
+		this.loader = new ConfigServerConfigDataLoader(destination -> logger);
 		ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class);
 		RestTemplate restTemplate = new RestTemplate(requestFactory);
 		when(bootstrapContext.get(RestTemplate.class)).thenReturn(restTemplate);
@@ -373,7 +373,7 @@ public class ConfigServerConfigDataLoaderTests {
 		properties.setUri(uris);
 		properties.setFailFast(true);
 		properties.setMultipleUriStrategy(ConfigClientProperties.MultipleUriStrategy.ALWAYS);
-		this.loader = new ConfigServerConfigDataLoader(logger);
+		this.loader = new ConfigServerConfigDataLoader(destination -> logger);
 		ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class);
 		RestTemplate restTemplate = new RestTemplate(requestFactory);
 		when(bootstrapContext.get(RestTemplate.class)).thenReturn(restTemplate);
@@ -404,7 +404,7 @@ public class ConfigServerConfigDataLoaderTests {
 		// Strategy is CONNECTION_TIMEOUT_ONLY, so it should not try the next URI for
 		// INTERNAL_SERVER_ERROR
 		properties.setMultipleUriStrategy(multipleUriStrategy);
-		this.loader = new ConfigServerConfigDataLoader(logger);
+		this.loader = new ConfigServerConfigDataLoader(destination -> logger);
 		ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class);
 		RestTemplate restTemplate = new RestTemplate(requestFactory);
 		mockRequestResponse(requestFactory, badURI, firstUriResponse);
@@ -453,7 +453,7 @@ public class ConfigServerConfigDataLoaderTests {
 		properties.setFailFast(true);
 		// Strategy is ALWAYS, so it should try all URIs until successful
 		properties.setMultipleUriStrategy(multipleUriStrategy);
-		this.loader = new ConfigServerConfigDataLoader(logger);
+		this.loader = new ConfigServerConfigDataLoader(destination -> logger);
 		ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class);
 		RestTemplate restTemplate = new RestTemplate(requestFactory);
 		mockRequestResponse(requestFactory, badURI, firstUriResponse);
@@ -473,7 +473,7 @@ public class ConfigServerConfigDataLoaderTests {
 		properties.setFailFast(true);
 		// Strategy should not matter when the error is connection timed out
 		properties.setMultipleUriStrategy(multipleUriStrategy);
-		this.loader = new ConfigServerConfigDataLoader(logger);
+		this.loader = new ConfigServerConfigDataLoader(destination -> logger);
 		ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class);
 		RestTemplate restTemplate = new RestTemplate(requestFactory);
 		when(bootstrapContext.get(RestTemplate.class)).thenReturn(restTemplate);

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

@@ -51,7 +51,7 @@ public class ConfigServerConfigDataLocationResolverTests {
 	void setup() {
 		this.environment = new MockEnvironment();
 		this.environmentBinder = Binder.get(this.environment);
-		this.resolver = new ConfigServerConfigDataLocationResolver(new DeferredLog());
+		this.resolver = new ConfigServerConfigDataLocationResolver(destination -> new DeferredLog());
 		when(context.getBinder()).thenReturn(environmentBinder);
 	}
 

spring-cloud-config-server/src/test/resources/encrypt-repo/application.yml

@@ -2,8 +2,7 @@ info:
   foo: bar
 
 ---
-spring:
-  profiles: encrypt
+spring.config.activate.on-profile: encrypt
 config:
   foo: '{cipher}{key:mytestkey}AQCohs2V6P8/UiG6a4TF/CZTCBdt5Q7wvNvcyf6vs2ByK2ZYSM77Nu0sOAduxUpMbVwJ/syecmkIXR+hU3EfT2uqPieA7/v5n33ppqIQ9JAt5JggdYIGe+wX25zU3DTXOOJdAAMzNX+zjOVyCh0QtmJf/kFslg6NqQq0E+kSg3zBi3AnkKj5BLnLIxkjxzKA4mnDXpSm7ekLZZP2iQSYSW/82AC7UOLLzTqwInMI3tJLW1e9Ne+LDsjmSxA+nkK9zhidtXPwb/SPaNF74cJCEf9mgzzKYwJlwqChLzJt8UQ1jHwRc8B6FufmizUHSp27nxdtVB4HMqh3nNsMCy137Ces58T09ZS/y/cYNRxcFbp78MHFHUqAgbC0B/p5t6h4XbQ='
 

spring-cloud-config-server/src/test/resources/encrypt-repo/git/COMMIT_EDITMSG

@@ -1 +1 @@
-Added server overrides
+changed spring.profiles to spring.config.activate.on-profile

spring-cloud-config-server/src/test/resources/encrypt-repo/git/logs/HEAD

@@ -8,3 +8,4 @@
 ad5e0cb7036ed11ddd4b7be6ed86ad3565c8a3fc bd414a6cc8653d7e282df0a257babc6283b83596 Marcin Grzejszczak <marcin@grzejszczak.pl> 1549357702 +0100	commit: Updated
 bd414a6cc8653d7e282df0a257babc6283b83596 fd07d827993aaf6ed7ef1b979767ee9277d1d409 Tim Ysewyn <tysewyn@pivotal.io> 1564492480 +0200	commit: Added server overrides
 fd07d827993aaf6ed7ef1b979767ee9277d1d409 fd07d827993aaf6ed7ef1b979767ee9277d1d409 Ryan Baxter <rbaxter@vmware.com> 1636990355 -0500	checkout: moving from master to main
+fd07d827993aaf6ed7ef1b979767ee9277d1d409 fb1a59a90f034288d14dc4b607f9f76697aa972d spencergibb <spencer@gibb.us> 1652114959 -0400	commit: changed spring.profiles to spring.config.activate.on-profile

spring-cloud-config-server/src/test/resources/encrypt-repo/git/logs/refs/heads/main

@@ -1 +1,2 @@
 0000000000000000000000000000000000000000 fd07d827993aaf6ed7ef1b979767ee9277d1d409 Ryan Baxter <rbaxter@vmware.com> 1636990355 -0500	branch: Created from HEAD
+fd07d827993aaf6ed7ef1b979767ee9277d1d409 fb1a59a90f034288d14dc4b607f9f76697aa972d spencergibb <spencer@gibb.us> 1652114959 -0400	commit: changed spring.profiles to spring.config.activate.on-profile

spring-cloud-config-server/src/test/resources/encrypt-repo/git/refs/heads/main

@@ -1 +1 @@
-fd07d827993aaf6ed7ef1b979767ee9277d1d409
+fb1a59a90f034288d14dc4b607f9f76697aa972d