@@ -673,7 +673,8 @@ public void validatorWhenNoCustomizationShouldUseAutoConfigured() {
673
673
.getBeanNamesForType (javax .validation .Validator .class );
674
674
String [] springValidatorBeans = this .context .getBeanNamesForType (Validator .class );
675
675
assertThat (jsrValidatorBeans ).containsExactly ("defaultValidator" );
676
- assertThat (springValidatorBeans ).containsExactly ("defaultValidator" , "mvcValidator" );
676
+ assertThat (springValidatorBeans ).containsExactly ("defaultValidator" ,
677
+ "mvcValidator" );
677
678
Validator validator = this .context .getBean ("mvcValidator" , Validator .class );
678
679
assertThat (validator ).isInstanceOf (WebMvcValidator .class );
679
680
Object defaultValidator = this .context .getBean ("defaultValidator" );
@@ -696,7 +697,8 @@ public void validatorWithConfigurerShouldUseSpringValidator() {
696
697
697
698
@ Test
698
699
public void validatorWithConfigurerDoesNotExposeJsr303 () {
699
- load (MvcJsr303Validator .class , new Class <?>[] { ValidationAutoConfiguration .class });
700
+ load (MvcJsr303Validator .class ,
701
+ new Class <?>[] { ValidationAutoConfiguration .class });
700
702
assertThat (this .context .getBeansOfType (ValidatorFactory .class )).isEmpty ();
701
703
assertThat (this .context .getBeansOfType (javax .validation .Validator .class ))
702
704
.isEmpty ();
@@ -715,7 +717,8 @@ public void validatorWithConfigurerTakesPrecedence() {
715
717
assertThat (this .context .getBeansOfType (javax .validation .Validator .class ))
716
718
.hasSize (1 );
717
719
String [] springValidatorBeans = this .context .getBeanNamesForType (Validator .class );
718
- assertThat (springValidatorBeans ).containsExactly ("defaultValidator" , "mvcValidator" );
720
+ assertThat (springValidatorBeans ).containsExactly ("defaultValidator" ,
721
+ "mvcValidator" );
719
722
assertThat (this .context .getBean ("mvcValidator" ))
720
723
.isSameAs (this .context .getBean (MvcValidator .class ).validator );
721
724
// Primary Spring validator is the auto-configured one as the MVC one has been
@@ -731,13 +734,12 @@ public void validatorWithCustomSpringValidatorIgnored() {
731
734
.getBeanNamesForType (javax .validation .Validator .class );
732
735
String [] springValidatorBeans = this .context .getBeanNamesForType (Validator .class );
733
736
assertThat (jsrValidatorBeans ).containsExactly ("defaultValidator" );
734
- assertThat (springValidatorBeans ).containsExactly (
735
- "customSpringValidator" , " defaultValidator" , "mvcValidator" );
737
+ assertThat (springValidatorBeans ).containsExactly ("customSpringValidator" ,
738
+ "defaultValidator" , "mvcValidator" );
736
739
Validator validator = this .context .getBean ("mvcValidator" , Validator .class );
737
740
assertThat (validator ).isInstanceOf (WebMvcValidator .class );
738
741
Object defaultValidator = this .context .getBean ("defaultValidator" );
739
- assertThat (((WebMvcValidator ) validator ).getTarget ())
740
- .isSameAs (defaultValidator );
742
+ assertThat (((WebMvcValidator ) validator ).getTarget ()).isSameAs (defaultValidator );
741
743
// Primary Spring validator is the one used by MVC behind the scenes
742
744
assertThat (this .context .getBean (Validator .class )).isEqualTo (defaultValidator );
743
745
}
@@ -753,8 +755,7 @@ public void validatorWithCustomJsr303ValidatorExposedAsSpringValidator() {
753
755
assertThat (springValidatorBeans ).containsExactly ("mvcValidator" );
754
756
Validator validator = this .context .getBean (Validator .class );
755
757
assertThat (validator ).isInstanceOf (WebMvcValidator .class );
756
- SpringValidatorAdapter target = ((WebMvcValidator ) validator )
757
- .getTarget ();
758
+ SpringValidatorAdapter target = ((WebMvcValidator ) validator ).getTarget ();
758
759
assertThat (new DirectFieldAccessor (target ).getPropertyValue ("targetValidator" ))
759
760
.isSameAs (this .context .getBean ("customJsr303Validator" ));
760
761
}
0 commit comments