Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply Java 8 constructs and features (e.g. Method References).

Browse Source
This commit is contained in:
John Blum
2019-01-28 09:41:27 -08:00
parent f62e7cd5e0
commit 60d23c9b8f
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-geode/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java vendored
View File

@@ -97,8 +97,9 @@ public class VcapPropertySource extends PropertySource<EnumerablePropertySource<
public static VcapPropertySource from(Environment environment) {
return Optional.ofNullable(environment)
.filter(env -> env instanceof ConfigurableEnvironment)
.map(env -> ((ConfigurableEnvironment) env).getPropertySources())
.filter(ConfigurableEnvironment.class::isInstance)
.map(ConfigurableEnvironment.class::cast)
.map(ConfigurableEnvironment::getPropertySources)
.map(propertySources -> propertySources.get(VCAP_PROPERTY_SOURCE_NAME))
.map(VcapPropertySource::from)
.orElseThrow(() -> newIllegalArgumentException(
@@ -119,15 +120,25 @@ public class VcapPropertySource extends PropertySource<EnumerablePropertySource<
return Optional.ofNullable(propertySource)
.filter(it -> VCAP_PROPERTY_SOURCE_NAME.equals(it.getName()))
.filter(it -> it instanceof EnumerablePropertySource)
.filter(VCAP_REQUIRED_PROPERTIES_PREDICATE)
.map(it -> (EnumerablePropertySource) it)
.filter(EnumerablePropertySource.class::isInstance)
.map(EnumerablePropertySource.class::cast)
.map(VcapPropertySource::new)
.orElseThrow(() -> newIllegalArgumentException(
"A valid EnumerablePropertySource named [%s] with VCAP properties is required",
"A valid EnumerablePropertySource named [%s] containing VCAP properties is required",
VCAP_PROPERTY_SOURCE_NAME));
}
/**
* Constructs a new {@link PropertySource} from the existing, required {@link EnumerablePropertySource} instance
* with the default name, {@literal boot.data.gemfire.vcap}, containing the {@literal VCAP} environment variable
* configuration.
*
* @param propertySource existing, required {@link EnumerablePropertySource} containing the {@literal VCAP}
* environment variables.
* @throws IllegalArgumentException if the {@literal EnumerablePropertySource} is {@literal null}.
* @see org.springframework.core.env.EnumerablePropertySource
*/
private VcapPropertySource(EnumerablePropertySource<?> propertySource) {
super(THIS_PROPERTY_SOURCE_NAME, propertySource);
}
@@ -218,7 +229,11 @@ public class VcapPropertySource extends PropertySource<EnumerablePropertySource<
String username = String.valueOf(getProperty(userPropertyName+".username"));
String password = String.valueOf(getProperty(userPropertyName+".password"));
return Optional.of(User.with(username).withPassword(password).withRole(User.Role.CLUSTER_OPERATOR));
User user = User.with(username)
.withPassword(password)
.withRole(User.Role.CLUSTER_OPERATOR);
return Optional.of(user);
}
return Optional.empty();