mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Polish
This commit is contained in:
parent
47fd5f4fac
commit
5867cd6175
@ -117,10 +117,9 @@ class CloudFoundrySecurityService {
|
||||
|
||||
private Map<String, String> extractTokenKeys(Map<?, ?> response) {
|
||||
Map<String, String> tokenKeys = new HashMap<String, String>();
|
||||
List<?> keys = (List<?>) response.get("keys");
|
||||
for (Object key : keys) {
|
||||
for (Object key : (List<?>) response.get("keys")) {
|
||||
Map<?, ?> tokenKey = (Map<?, ?>) key;
|
||||
tokenKeys.put((String) (tokenKey).get("kid"), (String) (tokenKey).get("value"));
|
||||
tokenKeys.put((String) tokenKey.get("kid"), (String) tokenKey.get("value"));
|
||||
}
|
||||
return tokenKeys;
|
||||
}
|
||||
|
@ -97,7 +97,6 @@ class Token {
|
||||
return getRequired(this.claims, "scope", List.class);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public String getKeyId() {
|
||||
return getRequired(this.header, "kid", String.class);
|
||||
}
|
||||
|
@ -52,8 +52,6 @@ class TokenValidator {
|
||||
validateAudience(token);
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void validateAlgorithm(Token token) {
|
||||
String algorithm = token.getSignatureAlgorithm();
|
||||
if (algorithm == null) {
|
||||
@ -83,9 +81,9 @@ class TokenValidator {
|
||||
}
|
||||
}
|
||||
|
||||
private boolean hasValidKeyId(String tokenKeyId) {
|
||||
for (String keyId: this.tokenKeys.keySet()) {
|
||||
if (tokenKeyId.equals(keyId)) {
|
||||
private boolean hasValidKeyId(String tokenKey) {
|
||||
for (String candidate : this.tokenKeys.keySet()) {
|
||||
if (tokenKey.equals(candidate)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -85,7 +85,8 @@ public class TokenValidatorTests {
|
||||
private static final Map<String, String> INVALID_KEYS = Collections
|
||||
.singletonMap("invalid-key", INVALID_KEY);
|
||||
|
||||
private static final Map<String, String> VALID_KEYS = Collections.singletonMap("valid-key", VALID_KEY);
|
||||
private static final Map<String, String> VALID_KEYS = Collections
|
||||
.singletonMap("valid-key", VALID_KEY);
|
||||
|
||||
@Before
|
||||
public void setup() throws Exception {
|
||||
@ -100,8 +101,8 @@ public class TokenValidatorTests {
|
||||
given(this.securityService.fetchTokenKeys()).willReturn(INVALID_KEYS);
|
||||
String header = "{\"alg\": \"RS256\", \"kid\": \"valid-key\",\"typ\": \"JWT\"}";
|
||||
String claims = "{\"exp\": 2147483647, \"iss\": \"http://localhost:8080/uaa/oauth/token\", \"scope\": [\"actuator.read\"]}";
|
||||
this.thrown.expect(
|
||||
AuthorizationExceptionMatcher.withReason(Reason.INVALID_KEY_ID));
|
||||
this.thrown
|
||||
.expect(AuthorizationExceptionMatcher.withReason(Reason.INVALID_KEY_ID));
|
||||
this.tokenValidator.validate(
|
||||
new Token(getSignedToken(header.getBytes(), claims.getBytes())));
|
||||
}
|
||||
@ -131,8 +132,7 @@ public class TokenValidatorTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void validateTokenWhenValidShouldNotFetchTokenKeys()
|
||||
throws Exception {
|
||||
public void validateTokenWhenValidShouldNotFetchTokenKeys() throws Exception {
|
||||
ReflectionTestUtils.setField(this.tokenValidator, "tokenKeys", VALID_KEYS);
|
||||
given(this.securityService.getUaaUrl()).willReturn("http://localhost:8080/uaa");
|
||||
String header = "{ \"alg\": \"RS256\", \"kid\": \"valid-key\",\"typ\": \"JWT\"}";
|
||||
@ -144,7 +144,8 @@ public class TokenValidatorTests {
|
||||
|
||||
@Test
|
||||
public void validateTokenWhenSignatureInvalidShouldThrowException() throws Exception {
|
||||
ReflectionTestUtils.setField(this.tokenValidator, "tokenKeys", Collections.singletonMap("valid-key", INVALID_KEY));
|
||||
ReflectionTestUtils.setField(this.tokenValidator, "tokenKeys",
|
||||
Collections.singletonMap("valid-key", INVALID_KEY));
|
||||
given(this.securityService.getUaaUrl()).willReturn("http://localhost:8080/uaa");
|
||||
String header = "{ \"alg\": \"RS256\", \"kid\": \"valid-key\",\"typ\": \"JWT\"}";
|
||||
String claims = "{ \"exp\": 2147483647, \"iss\": \"http://localhost:8080/uaa/oauth/token\", \"scope\": [\"actuator.read\"]}";
|
||||
|
@ -109,24 +109,7 @@ public class EmbeddedLdapAutoConfiguration {
|
||||
this.embeddedProperties.getCredential().getUsername(),
|
||||
this.embeddedProperties.getCredential().getPassword());
|
||||
}
|
||||
|
||||
if (!this.embeddedProperties.getValidation().isEnabled()) {
|
||||
config.setSchema(null);
|
||||
}
|
||||
else {
|
||||
Resource schema = this.embeddedProperties.getValidation().getSchema();
|
||||
if (schema != null) {
|
||||
try {
|
||||
config.setSchema(Schema.mergeSchemas(Schema.getDefaultStandardSchema(),
|
||||
Schema.getSchema(schema.getInputStream())));
|
||||
}
|
||||
catch (Exception ex) {
|
||||
throw new IllegalStateException(
|
||||
"Unable to load schema " + schema.getDescription(), ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
setSchema(config);
|
||||
InMemoryListenerConfig listenerConfig = InMemoryListenerConfig
|
||||
.createLDAPConfig("LDAP", this.embeddedProperties.getPort());
|
||||
config.setListenerConfigs(listenerConfig);
|
||||
@ -137,6 +120,29 @@ public class EmbeddedLdapAutoConfiguration {
|
||||
return this.server;
|
||||
}
|
||||
|
||||
private void setSchema(InMemoryDirectoryServerConfig config) {
|
||||
if (!this.embeddedProperties.getValidation().isEnabled()) {
|
||||
config.setSchema(null);
|
||||
return;
|
||||
}
|
||||
Resource schema = this.embeddedProperties.getValidation().getSchema();
|
||||
if (schema != null) {
|
||||
setSchema(config, schema);
|
||||
}
|
||||
}
|
||||
|
||||
private void setSchema(InMemoryDirectoryServerConfig config, Resource resource) {
|
||||
try {
|
||||
Schema defaultSchema = Schema.getDefaultStandardSchema();
|
||||
Schema schema = Schema.getSchema(resource.getInputStream());
|
||||
config.setSchema(Schema.mergeSchemas(defaultSchema, schema));
|
||||
}
|
||||
catch (Exception ex) {
|
||||
throw new IllegalStateException(
|
||||
"Unable to load schema " + resource.getDescription(), ex);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean hasCredentials(Credential credential) {
|
||||
return StringUtils.hasText(credential.getUsername())
|
||||
&& StringUtils.hasText(credential.getPassword());
|
||||
|
@ -203,31 +203,36 @@ public class ResourceServerProperties implements Validator, BeanFactoryAware {
|
||||
return;
|
||||
}
|
||||
ResourceServerProperties resource = (ResourceServerProperties) target;
|
||||
validate(resource, errors);
|
||||
|
||||
}
|
||||
|
||||
private void validate(ResourceServerProperties target, Errors errors) {
|
||||
if ((StringUtils.hasText(this.jwt.getKeyUri())
|
||||
|| StringUtils.hasText(this.jwt.getKeyValue()))
|
||||
&& StringUtils.hasText(this.jwk.getKeySetUri())) {
|
||||
errors.reject("ambiguous.keyUri", "Only one of jwt.keyUri (or jwt.keyValue) and jwk.keySetUri should be configured.");
|
||||
errors.reject("ambiguous.keyUri",
|
||||
"Only one of jwt.keyUri (or jwt.keyValue) and "
|
||||
+ "jwk.keySetUri should be configured.");
|
||||
}
|
||||
|
||||
else {
|
||||
if (StringUtils.hasText(this.clientId)) {
|
||||
if (!StringUtils.hasText(this.clientSecret)) {
|
||||
if (!StringUtils.hasText(resource.getUserInfoUri())) {
|
||||
if (!StringUtils.hasText(target.getUserInfoUri())) {
|
||||
errors.rejectValue("userInfoUri", "missing.userInfoUri",
|
||||
"Missing userInfoUri (no client secret available)");
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (isPreferTokenInfo()
|
||||
&& !StringUtils.hasText(resource.getTokenInfoUri())) {
|
||||
&& !StringUtils.hasText(target.getTokenInfoUri())) {
|
||||
if (StringUtils.hasText(getJwt().getKeyUri())
|
||||
|| StringUtils.hasText(getJwt().getKeyValue())
|
||||
|| StringUtils.hasText(getJwk().getKeySetUri())) {
|
||||
// It's a JWT decoder
|
||||
return;
|
||||
}
|
||||
if (!StringUtils.hasText(resource.getUserInfoUri())) {
|
||||
if (!StringUtils.hasText(target.getUserInfoUri())) {
|
||||
errors.rejectValue("tokenInfoUri", "missing.tokenInfoUri",
|
||||
"Missing tokenInfoUri and userInfoUri and there is no "
|
||||
+ "JWT verifier key");
|
||||
@ -236,7 +241,6 @@ public class ResourceServerProperties implements Validator, BeanFactoryAware {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private int countBeans(Class<?> type) {
|
||||
@ -294,9 +298,8 @@ public class ResourceServerProperties implements Validator, BeanFactoryAware {
|
||||
public class Jwk {
|
||||
|
||||
/**
|
||||
* The URI to get verification keys to verify the JWT token.
|
||||
* This can be set when the authorization server returns a
|
||||
* set of verification keys.
|
||||
* The URI to get verification keys to verify the JWT token. This can be set when
|
||||
* the authorization server returns a set of verification keys.
|
||||
*/
|
||||
private String keySetUri;
|
||||
|
||||
|
@ -26,9 +26,9 @@ import org.springframework.validation.Validator;
|
||||
import org.springframework.validation.beanvalidation.SpringValidatorAdapter;
|
||||
|
||||
/**
|
||||
* Wraps a {@link SpringValidatorAdapter} so that only the Spring's {@link Validator}
|
||||
* type is exposed. This prevents such a bean to expose both the Spring and JSR-303
|
||||
* validator contract at the same time.
|
||||
* Wraps a {@link SpringValidatorAdapter} so that only the Spring's {@link Validator} type
|
||||
* is exposed. This prevents such a bean to expose both the Spring and JSR-303 validator
|
||||
* contract at the same time.
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@ -36,6 +36,7 @@ class SpringValidatorAdapterWrapper
|
||||
implements Validator, ApplicationContextAware, InitializingBean, DisposableBean {
|
||||
|
||||
private final SpringValidatorAdapter target;
|
||||
|
||||
private final boolean managed;
|
||||
|
||||
SpringValidatorAdapterWrapper(SpringValidatorAdapter target, boolean managed) {
|
||||
@ -61,8 +62,8 @@ class SpringValidatorAdapterWrapper
|
||||
public void setApplicationContext(ApplicationContext applicationContext)
|
||||
throws BeansException {
|
||||
if (!this.managed && this.target instanceof ApplicationContextAware) {
|
||||
((ApplicationContextAware) this.target).setApplicationContext(
|
||||
applicationContext);
|
||||
((ApplicationContextAware) this.target)
|
||||
.setApplicationContext(applicationContext);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -575,15 +575,17 @@ public class WebMvcAutoConfiguration {
|
||||
try {
|
||||
if (this.userDefinedValidator != null) {
|
||||
if (this.userDefinedValidator instanceof javax.validation.Validator) {
|
||||
return wrap((javax.validation.Validator) this.userDefinedValidator, false);
|
||||
return wrap(
|
||||
(javax.validation.Validator) this.userDefinedValidator,
|
||||
false);
|
||||
}
|
||||
else {
|
||||
return this.userDefinedValidator;
|
||||
}
|
||||
}
|
||||
else {
|
||||
return wrap(this.applicationContext.getBean(
|
||||
javax.validation.Validator.class), true);
|
||||
return wrap(this.applicationContext
|
||||
.getBean(javax.validation.Validator.class), true);
|
||||
}
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException ex) {
|
||||
|
@ -32,11 +32,11 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
*/
|
||||
public class GroovyTemplateAvailabilityProviderTests {
|
||||
|
||||
private final TemplateAvailabilityProvider provider = new GroovyTemplateAvailabilityProvider();
|
||||
private TemplateAvailabilityProvider provider = new GroovyTemplateAvailabilityProvider();
|
||||
|
||||
private final ResourceLoader resourceLoader = new DefaultResourceLoader();
|
||||
private ResourceLoader resourceLoader = new DefaultResourceLoader();
|
||||
|
||||
private final MockEnvironment environment = new MockEnvironment();
|
||||
private MockEnvironment environment = new MockEnvironment();
|
||||
|
||||
@Test
|
||||
public void availabilityOfTemplateInDefaultLocation() {
|
||||
|
@ -390,11 +390,13 @@ public class OAuth2AutoConfigurationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resourceServerConditionWhenJwkConfigurationPresentShouldMatch() throws Exception {
|
||||
public void resourceServerConditionWhenJwkConfigurationPresentShouldMatch()
|
||||
throws Exception {
|
||||
this.context = new AnnotationConfigEmbeddedWebApplicationContext();
|
||||
EnvironmentTestUtils.addEnvironment(this.context,
|
||||
"security.oauth2.resource.jwk.key-set-uri:http://my-auth-server/token_keys");
|
||||
this.context.register(ResourceServerConfiguration.class, MinimalSecureWebApplication.class);
|
||||
this.context.register(ResourceServerConfiguration.class,
|
||||
MinimalSecureWebApplication.class);
|
||||
this.context.refresh();
|
||||
assertThat(countBeans(RESOURCE_SERVER_CONFIG)).isEqualTo(1);
|
||||
}
|
||||
|
@ -68,13 +68,15 @@ public class ResourceServerPropertiesTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void validateWhenBothJwtAndJwtKeyConfigurationPresentShouldFail() throws Exception {
|
||||
public void validateWhenBothJwtAndJwtKeyConfigurationPresentShouldFail()
|
||||
throws Exception {
|
||||
this.properties.getJwk().setKeySetUri("http://my-auth-server/token_keys");
|
||||
this.properties.getJwt().setKeyUri("http://my-auth-server/token_key");
|
||||
setListableBeanFactory();
|
||||
Errors errors = mock(Errors.class);
|
||||
this.properties.validate(this.properties, errors);
|
||||
verify(errors).reject("ambiguous.keyUri", "Only one of jwt.keyUri (or jwt.keyValue) and jwk.keySetUri should be configured.");
|
||||
verify(errors).reject("ambiguous.keyUri",
|
||||
"Only one of jwt.keyUri (or jwt.keyValue) and jwk.keySetUri should be configured.");
|
||||
|
||||
}
|
||||
|
||||
@ -89,14 +91,19 @@ public class ResourceServerPropertiesTests {
|
||||
|
||||
private void setListableBeanFactory() {
|
||||
ListableBeanFactory beanFactory = new StaticWebApplicationContext() {
|
||||
|
||||
@Override
|
||||
public String[] getBeanNamesForType(Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) {
|
||||
if (type.isAssignableFrom(ResourceServerTokenServicesConfiguration.class)) {
|
||||
return new String[]{"ResourceServerTokenServicesConfiguration"};
|
||||
public String[] getBeanNamesForType(Class<?> type,
|
||||
boolean includeNonSingletons, boolean allowEagerInit) {
|
||||
if (type.isAssignableFrom(
|
||||
ResourceServerTokenServicesConfiguration.class)) {
|
||||
return new String[] { "ResourceServerTokenServicesConfiguration" };
|
||||
}
|
||||
return new String[0];
|
||||
}
|
||||
|
||||
};
|
||||
this.properties.setBeanFactory(beanFactory);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -57,8 +57,8 @@ public class SpringValidatorAdapterWrapperTests {
|
||||
SpringValidatorAdapterWrapper wrapper = load(
|
||||
LocalValidatorFactoryBeanConfig.class);
|
||||
assertThat(wrapper.supports(SampleData.class)).isTrue();
|
||||
MapBindingResult errors = new MapBindingResult(
|
||||
new HashMap<String, Object>(), "test");
|
||||
MapBindingResult errors = new MapBindingResult(new HashMap<String, Object>(),
|
||||
"test");
|
||||
wrapper.validate(new SampleData(40), errors);
|
||||
assertThat(errors.getErrorCount()).isEqualTo(1);
|
||||
}
|
||||
@ -66,8 +66,8 @@ public class SpringValidatorAdapterWrapperTests {
|
||||
@Test
|
||||
public void wrapperInvokesCallbackOnNonManagedBean() {
|
||||
load(NonManagedBeanConfig.class);
|
||||
LocalValidatorFactoryBean validator = this.context.getBean(
|
||||
NonManagedBeanConfig.class).validator;
|
||||
LocalValidatorFactoryBean validator = this.context
|
||||
.getBean(NonManagedBeanConfig.class).validator;
|
||||
verify(validator, times(1)).setApplicationContext(any(ApplicationContext.class));
|
||||
verify(validator, times(1)).afterPropertiesSet();
|
||||
verify(validator, times(0)).destroy();
|
||||
@ -79,8 +79,8 @@ public class SpringValidatorAdapterWrapperTests {
|
||||
@Test
|
||||
public void wrapperDoesNotInvokeCallbackOnManagedBean() {
|
||||
load(ManagedBeanConfig.class);
|
||||
LocalValidatorFactoryBean validator = this.context.getBean(
|
||||
ManagedBeanConfig.class).validator;
|
||||
LocalValidatorFactoryBean validator = this.context
|
||||
.getBean(ManagedBeanConfig.class).validator;
|
||||
verify(validator, times(0)).setApplicationContext(any(ApplicationContext.class));
|
||||
verify(validator, times(0)).afterPropertiesSet();
|
||||
verify(validator, times(0)).destroy();
|
||||
@ -115,8 +115,8 @@ public class SpringValidatorAdapterWrapperTests {
|
||||
@Configuration
|
||||
static class NonManagedBeanConfig {
|
||||
|
||||
private final LocalValidatorFactoryBean validator
|
||||
= mock(LocalValidatorFactoryBean.class);
|
||||
private final LocalValidatorFactoryBean validator = mock(
|
||||
LocalValidatorFactoryBean.class);
|
||||
|
||||
@Bean
|
||||
public SpringValidatorAdapterWrapper wrapper() {
|
||||
@ -128,8 +128,8 @@ public class SpringValidatorAdapterWrapperTests {
|
||||
@Configuration
|
||||
static class ManagedBeanConfig {
|
||||
|
||||
private final LocalValidatorFactoryBean validator
|
||||
= mock(LocalValidatorFactoryBean.class);
|
||||
private final LocalValidatorFactoryBean validator = mock(
|
||||
LocalValidatorFactoryBean.class);
|
||||
|
||||
@Bean
|
||||
public SpringValidatorAdapterWrapper wrapper() {
|
||||
|
@ -662,8 +662,8 @@ public class WebMvcAutoConfigurationTests {
|
||||
.isEmpty();
|
||||
assertThat(this.context.getBeansOfType(Validator.class)).hasSize(1);
|
||||
Validator validator = this.context.getBean(Validator.class);
|
||||
assertThat(validator).isSameAs(this.context.getBean(MvcValidator.class)
|
||||
.validator);
|
||||
assertThat(validator)
|
||||
.isSameAs(this.context.getBean(MvcValidator.class).validator);
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -900,7 +900,7 @@ public class WebMvcAutoConfigurationTests {
|
||||
@Configuration
|
||||
protected static class MvcJsr303Validator extends WebMvcConfigurerAdapter {
|
||||
|
||||
private final LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
|
||||
private final LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
|
||||
|
||||
@Override
|
||||
public Validator getValidator() {
|
||||
|
@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<!-- Your own application should inherit from spring-boot-starter-parent -->
|
||||
@ -24,7 +25,7 @@
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-cache</artifactId>
|
||||
</dependency>
|
||||
<!-- Only used to expose cache metrics -->
|
||||
<!-- Only used to expose cache metrics -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
|
@ -121,7 +121,8 @@ class MockDefinition extends Definition {
|
||||
MockDefinition other = (MockDefinition) obj;
|
||||
boolean result = super.equals(obj);
|
||||
result = result && ObjectUtils.nullSafeEquals(this.typeToMock, other.typeToMock);
|
||||
result = result && ObjectUtils.nullSafeEquals(this.extraInterfaces, other.extraInterfaces);
|
||||
result = result && ObjectUtils.nullSafeEquals(this.extraInterfaces,
|
||||
other.extraInterfaces);
|
||||
result = result && ObjectUtils.nullSafeEquals(this.answer, other.answer);
|
||||
result = result && this.serializable == other.serializable;
|
||||
return result;
|
||||
|
@ -278,12 +278,19 @@ class ProjectLibraries implements Libraries {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Strategy used to resolve configurations regardless of the underlying Gradle
|
||||
* version.
|
||||
*/
|
||||
private interface TargetConfigurationResolver {
|
||||
|
||||
Configuration resolveTargetConfiguration(ProjectDependency projectDependency);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* {@link TargetConfigurationResolver} for Gradle 2.x.
|
||||
*/
|
||||
private static final class Gradle2TargetConfigurationResolver
|
||||
implements TargetConfigurationResolver {
|
||||
|
||||
@ -295,6 +302,9 @@ class ProjectLibraries implements Libraries {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* {@link TargetConfigurationResolver} for Gradle 3.x.
|
||||
*/
|
||||
private static final class Gradle3TargetConfigurationResolver
|
||||
implements TargetConfigurationResolver {
|
||||
|
||||
|
@ -70,8 +70,7 @@ public class PropertySourcesPropertyValues implements PropertyValues {
|
||||
* Create a new PropertyValues from the given PropertySources that will optionally
|
||||
* resolve placeholders.
|
||||
* @param propertySources a PropertySources instance
|
||||
* @param resolvePlaceholders {@code true} if placeholders should be resolved,
|
||||
* otherwise {@code false}
|
||||
* @param resolvePlaceholders {@code true} if placeholders should be resolved.
|
||||
* @since 1.5.2
|
||||
*/
|
||||
public PropertySourcesPropertyValues(PropertySources propertySources,
|
||||
|
@ -529,6 +529,7 @@ public class ConfigurationPropertiesBindingPostProcessorTests {
|
||||
public void setFoo(String foo) {
|
||||
this.foo = foo;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Configuration
|
||||
|
@ -58,7 +58,8 @@ public class BindFailureAnalyzerTests {
|
||||
|
||||
@Test
|
||||
public void bindExceptionWithFieldErrorsDueToValidationFailure() {
|
||||
FailureAnalysis analysis = performAnalysis(FieldValidationFailureConfiguration.class);
|
||||
FailureAnalysis analysis = performAnalysis(
|
||||
FieldValidationFailureConfiguration.class);
|
||||
assertThat(analysis.getDescription())
|
||||
.contains(failure("test.foo.foo", "null", "may not be null"));
|
||||
assertThat(analysis.getDescription())
|
||||
@ -69,7 +70,8 @@ public class BindFailureAnalyzerTests {
|
||||
|
||||
@Test
|
||||
public void bindExceptionWithObjectErrorsDueToValidationFailure() throws Exception {
|
||||
FailureAnalysis analysis = performAnalysis(ObjectValidationFailureConfiguration.class);
|
||||
FailureAnalysis analysis = performAnalysis(
|
||||
ObjectValidationFailureConfiguration.class);
|
||||
assertThat(analysis.getDescription())
|
||||
.contains("Reason: This object could not be bound.");
|
||||
}
|
||||
@ -171,6 +173,7 @@ public class BindFailureAnalyzerTests {
|
||||
public boolean supports(Class<?> clazz) {
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user