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

Compatibility updates for framework 6 and boot 3

Browse Source
This commit is contained in:
spencergibb
2022-01-03 16:26:26 -05:00
parent 1f3977e5f7
commit 4d9d242841
26 changed files with 77 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java
View File

@@ -23,7 +23,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.loadbalancer.AsyncLoadBalancerAutoConfiguration;
import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
@@ -49,8 +48,7 @@ import org.springframework.web.client.RestTemplate;
@Configuration(proxyBeanMethods = false)
@LoadBalancerClients
@AutoConfigureAfter(LoadBalancerAutoConfiguration.class)
@AutoConfigureBefore({ org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration.class,
AsyncLoadBalancerAutoConfiguration.class })
@AutoConfigureBefore({ org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration.class })
@ConditionalOnClass(RestTemplate.class)
public class BlockingLoadBalancerClientAutoConfiguration {

10
spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerCacheAutoConfiguration.java
View File

@@ -16,13 +16,12 @@
package org.springframework.cloud.loadbalancer.config;
import javax.annotation.PostConstruct;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.stoyanr.evictor.ConcurrentMapWithTimedEviction;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
@@ -72,12 +71,13 @@ public class LoadBalancerCacheAutoConfiguration {
}
static class LoadBalancerCaffeineWarnLogger {
static class LoadBalancerCaffeineWarnLogger implements InitializingBean {
private static final Log LOG = LogFactory.getLog(LoadBalancerCaffeineWarnLogger.class);
@PostConstruct
void logWarning() {
@Override
public void afterPropertiesSet() {
if (LOG.isWarnEnabled()) {
LOG.warn("Spring Cloud LoadBalancer is currently working with the default cache. "
+ "While this cache implementation is useful for development and tests, it's recommended to use Caffeine cache in production."