root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-02-06 14:08:24 +01:00
parent 6af6e8e31b 519a03ccda
commit 3c6d630a62
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java
View File

@ -157,7 +157,7 @@ public class ImportAutoConfigurationImportSelectorTests {
Set<Object> set1 = this.importSelector.determineImports( Set<Object> set1 = this.importSelector.determineImports(
getAnnotationMetadata(ImportAutoConfigurationWithItemsOne.class)); getAnnotationMetadata(ImportAutoConfigurationWithItemsOne.class));
Set<Object> set2 = this.importSelector.determineImports( Set<Object> set2 = this.importSelector.determineImports(
getAnnotationMetadata(ImportAutoConfigurationWithItemsOne.class)); getAnnotationMetadata(ImportAutoConfigurationWithItemsTwo.class));
assertThat(set1).isEqualTo(set2); assertThat(set1).isEqualTo(set2);
} }
@ -228,13 +228,13 @@ public class ImportAutoConfigurationImportSelectorTests {
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@ImportAutoConfiguration(FreeMarkerAutoConfiguration.class) @ImportAutoConfiguration(FreeMarkerAutoConfiguration.class)
static @interface ImportOne { @interface ImportOne {
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@ImportAutoConfiguration(ThymeleafAutoConfiguration.class) @ImportAutoConfiguration(ThymeleafAutoConfiguration.class)
static @interface ImportTwo { @interface ImportTwo {
} }
@ -269,7 +269,7 @@ public class ImportAutoConfigurationImportSelectorTests {
} }
@ImportAutoConfiguration(classes = ThymeleafAutoConfiguration.class) @ImportAutoConfiguration(classes = ThymeleafAutoConfiguration.class)
@UnrelatedOne @UnrelatedTwo
static class ImportAutoConfigurationWithItemsTwo { static class ImportAutoConfigurationWithItemsTwo {
} }
@ -288,7 +288,7 @@ public class ImportAutoConfigurationImportSelectorTests {
@ImportAutoConfiguration @ImportAutoConfiguration
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface MetaImportAutoConfiguration { @interface MetaImportAutoConfiguration {
@AliasFor(annotation = ImportAutoConfiguration.class, attribute = "exclude") @AliasFor(annotation = ImportAutoConfiguration.class, attribute = "exclude")
Class<?>[] exclude() default {}; Class<?>[] exclude() default {};
@ -296,19 +296,19 @@ public class ImportAutoConfigurationImportSelectorTests {
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface UnrelatedOne { @interface UnrelatedOne {
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface UnrelatedTwo { @interface UnrelatedTwo {
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@ImportAutoConfiguration(ThymeleafAutoConfiguration.class) @ImportAutoConfiguration(ThymeleafAutoConfiguration.class)
@SelfAnnotating @SelfAnnotating
static @interface SelfAnnotating { @interface SelfAnnotating {
@AliasFor(annotation = ImportAutoConfiguration.class, attribute = "exclude") @AliasFor(annotation = ImportAutoConfiguration.class, attribute = "exclude")
Class<?>[] excludeAutoConfiguration() default {}; Class<?>[] excludeAutoConfiguration() default {};