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 '2.1.x'

This commit is contained in:
Stephane Nicoll 2019-01-14 08:13:37 -05:00
parent 0fa3844480 c6f5719c96
commit 33f2bd4d61
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/cache/ImportsContextCustomizerFactoryWithAutoConfigurationTests.java vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2019 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.
@ -141,12 +141,12 @@ public class ImportsContextCustomizerFactoryWithAutoConfigurationTests {
}
@Retention(RetentionPolicy.RUNTIME)
static @interface Unrelated1 {
@interface Unrelated1 {
}
@Retention(RetentionPolicy.RUNTIME)
static @interface Unrelated2 {
@interface Unrelated2 {
}

4
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/FilterAnnotationsTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2019 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.
@ -119,7 +119,7 @@ public class FilterAnnotationsTests {
@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Documented
static @interface Filters {
@interface Filters {
Filter[] value();

30
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/AnnotationsPropertySourceTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 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.
@ -199,7 +199,7 @@ public class AnnotationsPropertySourceTests {
@Retention(RetentionPolicy.RUNTIME)
@PropertyMapping
static @interface TypeLevelAnnotation {
@interface TypeLevelAnnotation {
String value();
@ -212,7 +212,7 @@ public class AnnotationsPropertySourceTests {
@Retention(RetentionPolicy.RUNTIME)
@PropertyMapping("test")
static @interface TypeLevelWithPrefixAnnotation {
@interface TypeLevelWithPrefixAnnotation {
String value();
@ -224,7 +224,7 @@ public class AnnotationsPropertySourceTests {
}
@Retention(RetentionPolicy.RUNTIME)
static @interface AttributeLevelWithPrefixAnnotation {
@interface AttributeLevelWithPrefixAnnotation {
@PropertyMapping("test")
String value();
@ -238,7 +238,7 @@ public class AnnotationsPropertySourceTests {
@Retention(RetentionPolicy.RUNTIME)
@PropertyMapping("test")
static @interface TypeAndAttributeLevelWithPrefixAnnotation {
@interface TypeAndAttributeLevelWithPrefixAnnotation {
@PropertyMapping("example")
String value();
@ -252,7 +252,7 @@ public class AnnotationsPropertySourceTests {
@Retention(RetentionPolicy.RUNTIME)
@PropertyMapping(skip = SkipPropertyMapping.YES)
static @interface NotMappedAtTypeLevelAnnotation {
@interface NotMappedAtTypeLevelAnnotation {
@PropertyMapping
String value();
@ -268,7 +268,7 @@ public class AnnotationsPropertySourceTests {
@Retention(RetentionPolicy.RUNTIME)
@PropertyMapping
static @interface NotMappedAtAttributeLevelAnnotation {
@interface NotMappedAtAttributeLevelAnnotation {
String value();
@ -286,7 +286,7 @@ public class AnnotationsPropertySourceTests {
@Retention(RetentionPolicy.RUNTIME)
@PropertyMapping
static @interface ArraysAnnotation {
@interface ArraysAnnotation {
String[] strings();
@ -311,7 +311,7 @@ public class AnnotationsPropertySourceTests {
@Retention(RetentionPolicy.RUNTIME)
@PropertyMapping
static @interface CamelCaseToKebabCaseAnnotation {
@interface CamelCaseToKebabCaseAnnotation {
String camelCaseToKebabCase() default "abc";
@ -324,7 +324,7 @@ public class AnnotationsPropertySourceTests {
@Retention(RetentionPolicy.RUNTIME)
@TypeLevelAnnotation("foo")
static @interface PropertiesFromSingleMetaAnnotationAnnotation {
@interface PropertiesFromSingleMetaAnnotationAnnotation {
}
@ -337,7 +337,7 @@ public class AnnotationsPropertySourceTests {
@TypeLevelAnnotation("alpha")
@TypeLevelWithPrefixAnnotation("bravo")
@TypeAndAttributeLevelWithPrefixAnnotation("charlie")
static @interface PropertiesFromMultipleMetaAnnotationsAnnotation {
@interface PropertiesFromMultipleMetaAnnotationsAnnotation {
}
@ -348,7 +348,7 @@ public class AnnotationsPropertySourceTests {
@Retention(RetentionPolicy.RUNTIME)
@AliasedAttributeAnnotation
static @interface AttributeWithAliasAnnotation {
@interface AttributeWithAliasAnnotation {
@AliasFor(annotation = AliasedAttributeAnnotation.class)
String value() default "foo";
@ -359,7 +359,7 @@ public class AnnotationsPropertySourceTests {
@Retention(RetentionPolicy.RUNTIME)
@PropertyMapping("aliasing")
static @interface AliasedAttributeAnnotation {
@interface AliasedAttributeAnnotation {
String value() default "bar";
@ -367,7 +367,7 @@ public class AnnotationsPropertySourceTests {
@Retention(RetentionPolicy.RUNTIME)
@SelfAnnotating
static @interface SelfAnnotating {
@interface SelfAnnotating {
}
@ -397,7 +397,7 @@ public class AnnotationsPropertySourceTests {
@Retention(RetentionPolicy.RUNTIME)
@PropertyMapping("testenum")
static @interface EnumAnnotation {
@interface EnumAnnotation {
@PropertyMapping(skip = SkipPropertyMapping.ON_DEFAULT_VALUE)
EnumItem value() default EnumItem.DEFAULT;

8
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 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.
@ -115,7 +115,7 @@ public class PropertyMappingContextCustomizerFactoryTests {
}
@Retention(RetentionPolicy.RUNTIME)
static @interface NoMappingAnnotation {
@interface NoMappingAnnotation {
}
@ -132,7 +132,7 @@ public class PropertyMappingContextCustomizerFactoryTests {
@Retention(RetentionPolicy.RUNTIME)
@PropertyMapping
static @interface TypeMappingAnnotation {
@interface TypeMappingAnnotation {
String mapped() default "Mapped";
@ -149,7 +149,7 @@ public class PropertyMappingContextCustomizerFactoryTests {
}
@Retention(RetentionPolicy.RUNTIME)
static @interface AttributeMappingAnnotation {
@interface AttributeMappingAnnotation {
@PropertyMapping("mapped")
String value() default "Mapped";

4
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerFactoryTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 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.
@ -164,7 +164,7 @@ public class ImportsContextCustomizerFactoryTests {
@Retention(RetentionPolicy.RUNTIME)
@SelfAnnotating
static @interface SelfAnnotating {
@interface SelfAnnotating {
}

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 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.
@ -181,7 +181,7 @@ public class BindableTests {
}
@Retention(RetentionPolicy.RUNTIME)
static @interface TestAnnotation {
@interface TestAnnotation {
}