forked from spring-projects/spring-boot
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refine validation auto-configuration
Checking for the presence of a `ValidationProvider` resource is unfortunately not enough to trigger the validation auto-configuration. If `hibernate-validator` is added on the classpath without a `javax.el` implementation, the former will blow up on startup. So far this was a pilot error so we didn't have to care about it. Now that we have an auto-configuration that may lead to this error, we need to be extra careful and check that scenario ourselves. This commit adds an extra condition that runs as late as possible and attempt to actually initialize a `Validator`. If that fails for whatever reason, the auto-configuration will now back off. Several additional tests have been added to exercise this scenario. Closes spring-projectsgh-6228
- Loading branch information
Showing
3 changed files
with
142 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
...igure/validation/ValidationAutoConfigurationWithHibernateValidatorMissingElImplTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
/* | ||
* Copyright 2012-2016 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.boot.autoconfigure.validation; | ||
|
||
import org.junit.After; | ||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
||
import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; | ||
import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; | ||
import org.springframework.context.annotation.AnnotationConfigApplicationContext; | ||
import org.springframework.validation.beanvalidation.MethodValidationPostProcessor; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
|
||
/** | ||
* Test for {{@link ValidationAutoConfiguration} when Hibernate validator is present | ||
* but no EL implementation is available. | ||
* | ||
* @author Stephane Nicoll | ||
*/ | ||
@RunWith(ModifiedClassPathRunner.class) | ||
@ClassPathExclusions("tomcat-embed-el-*.jar") | ||
public class ValidationAutoConfigurationWithHibernateValidatorMissingElImplTests { | ||
|
||
private AnnotationConfigApplicationContext context; | ||
|
||
@After | ||
public void close() { | ||
if (this.context != null) { | ||
this.context.close(); | ||
} | ||
} | ||
|
||
@Test | ||
public void validationIsDisabled() { | ||
this.context = new AnnotationConfigApplicationContext( | ||
ValidationAutoConfiguration.class); | ||
assertThat(this.context.getBeansOfType(MethodValidationPostProcessor.class)) | ||
.isEmpty(); | ||
} | ||
|
||
} |
56 changes: 56 additions & 0 deletions
56
...ework/boot/autoconfigure/validation/ValidationAutoConfigurationWithoutValidatorTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
/* | ||
* Copyright 2012-2016 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.boot.autoconfigure.validation; | ||
|
||
import org.junit.After; | ||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
||
import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; | ||
import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; | ||
import org.springframework.context.annotation.AnnotationConfigApplicationContext; | ||
import org.springframework.validation.beanvalidation.MethodValidationPostProcessor; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
|
||
/** | ||
* Test for {{@link ValidationAutoConfiguration} when no JSR-303 provider is available. | ||
* | ||
* @author Stephane Nicoll | ||
*/ | ||
@RunWith(ModifiedClassPathRunner.class) | ||
@ClassPathExclusions("hibernate-validator-*.jar") | ||
public class ValidationAutoConfigurationWithoutValidatorTests { | ||
|
||
private AnnotationConfigApplicationContext context; | ||
|
||
@After | ||
public void close() { | ||
if (this.context != null) { | ||
this.context.close(); | ||
} | ||
} | ||
|
||
@Test | ||
public void validationIsDisabled() { | ||
this.context = new AnnotationConfigApplicationContext( | ||
ValidationAutoConfiguration.class); | ||
assertThat(this.context.getBeansOfType(MethodValidationPostProcessor.class)) | ||
.isEmpty(); | ||
} | ||
|
||
} |