SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes config data log constructor.

Browse Source 
Also, compatibility with framework 6/boot 3
This commit is contained in:
spencergibb
2022-05-09 12:58:51 -04:00
parent a613db4e06
commit a49a9d13d7
12 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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);

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

@@ -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);
}