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

Merge branch '2.2.x'

Browse Source
This commit is contained in:
spencergibb
2020-05-15 11:49:31 -04:00
parent 44c9d75953 b59a546ce8
commit b49f107dcd
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-context/src/main/java/org/springframework/cloud/util/random/CachedRandomPropertySource.java
View File

@@ -19,15 +19,13 @@ package org.springframework.cloud.util.random;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.springframework.boot.env.RandomValuePropertySource;
import org.springframework.core.env.PropertySource;
import org.springframework.util.StringUtils;
/**
* @author Ryan Baxter
*/
public class CachedRandomPropertySource
extends PropertySource<RandomValuePropertySource> {
public class CachedRandomPropertySource extends PropertySource<PropertySource> {
private static final String NAME = "cachedrandom";
@@ -35,13 +33,12 @@ public class CachedRandomPropertySource
private static Map<String, Map<String, Object>> cache = new ConcurrentHashMap<>();
public CachedRandomPropertySource(
RandomValuePropertySource randomValuePropertySource) {
public CachedRandomPropertySource(PropertySource randomValuePropertySource) {
super(NAME, randomValuePropertySource);
}
CachedRandomPropertySource(RandomValuePropertySource randomValuePropertySource,
CachedRandomPropertySource(PropertySource randomValuePropertySource,
Map<String, Map<String, Object>> cache) {
super(NAME, randomValuePropertySource);
this.cache = cache;

3
spring-cloud-context/src/main/java/org/springframework/cloud/util/random/CachedRandomPropertySourceAutoConfiguration.java
View File

@@ -40,8 +40,7 @@ public class CachedRandomPropertySourceAutoConfiguration {
PropertySource propertySource = propertySources
.get(RandomValuePropertySource.RANDOM_PROPERTY_SOURCE_NAME);
if (propertySource != null) {
propertySources.addLast(new CachedRandomPropertySource(
RandomValuePropertySource.class.cast(propertySource)));
propertySources.addLast(new CachedRandomPropertySource(propertySource));
}
}