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

Fix compiler warnings

Browse Source
This commit is contained in:
Dave Syer
2017-12-20 10:21:22 +00:00
parent 3089931065
commit 6a94cca462
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
spring-cloud-cloudfoundry-web/src/main/java/org/springframework/cloud/cloudfoundry/environment/VcapServiceCredentialsEnvironmentPostProcessor.java
View File

@@ -35,7 +35,7 @@ import org.springframework.util.StringUtils;
*
*/
public class VcapServiceCredentialsEnvironmentPostProcessor
implements EnvironmentPostProcessor, Ordered {
implements EnvironmentPostProcessor, Ordered {
static final Bindable<Map<String, Object>> STRING_OBJECT_MAP = Bindable
.mapOf(String.class, Object.class);
@@ -53,8 +53,8 @@ implements EnvironmentPostProcessor, Ordered {
@Override
public void postProcessEnvironment(ConfigurableEnvironment environment,
SpringApplication application) {
Map<String, Object> properties = Binder.get(environment)
.bind("vcap.services", STRING_OBJECT_MAP).orElseGet(Collections::emptyMap);
Binder.get(environment).bind("vcap.services", STRING_OBJECT_MAP)
.orElseGet(Collections::emptyMap);
if (!hasChildProperties(environment, "vcap.services")) {
return;
}
@@ -67,7 +67,8 @@ implements EnvironmentPostProcessor, Ordered {
else {
serviceId = environment.getProperty("security.oauth2.sso.service-id", "sso");
}
String authDomain = environment.getProperty("vcap.services." +serviceId + ".credentials.auth-domain");
String authDomain = environment
.getProperty("vcap.services." + serviceId + ".credentials.auth-domain");
if (authDomain != null) {
source.put("security.oauth2.resource.user-info-uri",
authDomain + "/userinfo");
@@ -82,8 +83,10 @@ implements EnvironmentPostProcessor, Ordered {
addProperty(source, environment, serviceId, "resource", "token-info-uri");
addProperty(source, environment, serviceId, "resource.jwt", "key-uri");
addProperty(source, environment, serviceId, "resource", "key-value");
addProperty(source, environment, serviceId, "client", "access-token-uri", "token-uri");
addProperty(source, environment, serviceId, "client", "user-authorization-uri", "authorization-uri");
addProperty(source, environment, serviceId, "client", "access-token-uri",
"token-uri");
addProperty(source, environment, serviceId, "client",
"user-authorization-uri", "authorization-uri");
}
addProperty(source, environment, serviceId, "client", "client-id");
addProperty(source, environment, serviceId, "client", "client-secret");
@@ -94,7 +97,7 @@ implements EnvironmentPostProcessor, Ordered {
source.put("security.oauth2.resource.id", resourceId);
}
environment.getPropertySources()
.addLast(new MapPropertySource("cloudDefaultSecurityBindings", source));
.addLast(new MapPropertySource("cloudDefaultSecurityBindings", source));
}
private boolean hasChildProperties(ConfigurableEnvironment environment, String name) {
@@ -103,27 +106,25 @@ implements EnvironmentPostProcessor, Ordered {
return !properties.isEmpty();
}
private void addProperty(Map<String, Object> source,
PropertyResolver resolver, String serviceId, String stem, String key, String... altKeys) {
private void addProperty(Map<String, Object> source, PropertyResolver resolver,
String serviceId, String stem, String key, String... altKeys) {
String value = resolve(resolver, serviceId, key);
if (StringUtils.hasText(value)) {
source.put("security.oauth2."+stem+"." + key, value);
source.put("security.oauth2." + stem + "." + key, value);
return;
}
for (String altKey : altKeys) {
value = resolve(resolver, serviceId, altKey);
if (StringUtils.hasText(value)) {
source.put("security.oauth2."+stem+"." + key, value);
source.put("security.oauth2." + stem + "." + key, value);
return;
}
}
}
private String resolve(PropertyResolver resolver, String serviceId,
String key) {
private String resolve(PropertyResolver resolver, String serviceId, String key) {
return resolver.getProperty(
String.format("vcap.services.%s.credentials.%s", serviceId, key),
"");
String.format("vcap.services.%s.credentials.%s", serviceId, key), "");
}
}

5
spring-cloud-cloudfoundry-web/src/main/java/org/springframework/cloud/cloudfoundry/session/StickyFilterConfiguration.java
View File

@@ -17,6 +17,7 @@ package org.springframework.cloud.cloudfoundry.session;
import java.io.IOException;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
@@ -42,8 +43,8 @@ public class StickyFilterConfiguration {
private String cookie;
@Bean
public FilterRegistrationBean stickyCloudFoundryFilter() {
FilterRegistrationBean filter = new FilterRegistrationBean();
public FilterRegistrationBean<?> stickyCloudFoundryFilter() {
FilterRegistrationBean<Filter> filter = new FilterRegistrationBean<Filter>();
filter.setOrder(Ordered.LOWEST_PRECEDENCE);
filter.setFilter(new OncePerRequestFilter() {
@Override