Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to checkstyle 6.17

Browse Source 
Fixes gh-5547
This commit is contained in:
Phillip Webb
2016-03-31 13:12:49 -07:00
parent 4f200a852b
commit 893a6c32f3
23 changed files with 67 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfiguration.java
View File

@@ -43,6 +43,7 @@ public @interface OverrideAutoConfiguration {
/**
* The value of the {@link EnableAutoConfiguration#ENABLED_OVERRIDE_PROPERTY enabled
* property override}.
* @return the override value
*/
boolean enabled();

4
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java
View File

@@ -103,8 +103,10 @@ public abstract class AnnotationCustomizableTypeExcludeFilter extends TypeExclud
protected abstract Set<Class<?>> getDefaultIncludes();
protected static enum FilterType {
protected enum FilterType {
INCLUDE, EXCLUDE
};
}

1
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFilters.java
View File

@@ -45,6 +45,7 @@ public @interface TypeExcludeFilters {
* specified here can either have a no-arg constructor or accept a single
* {@code Class<?>} argument if then need access to the {@code testClass}.
* @see TypeExcludeFilter
* @return the type exclude filters to apply
*/
Class<? extends TypeExcludeFilter>[] value();

1
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigureJsonTesters.java
View File

@@ -52,6 +52,7 @@ public @interface AutoConfigureJsonTesters {
/**
* If {@link BasicJsonTester}, {@link JacksonTester} and {@link GsonTester} fields
* should be initialized using marshallers from the {@link ApplicationContext}.
* @return if JSON tester fields should be initialized
*/
boolean initFields() default true;

4
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java
View File

@@ -47,18 +47,22 @@ public @interface JsonTest {
* {@code @JsonComponent} and {@code Module} beans are included.
* @see #includeFilters()
* @see #excludeFilters()
* @return if default filters should be used
*/
boolean useDefaultFilters() default true;
/**
* A set of include filters which can be used to add otherwise filtered beans to the
* application context.
* @return include filters to apply
*/
Filter[] includeFilters() default {};
/**
* A set of exclude filters which can be used to filter beans that would otherwise be
* added to the application context.
* @return exclude filters to apply
*/
Filter[] excludeFilters() default {};
}

4
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabase.java
View File

@@ -43,13 +43,15 @@ import org.springframework.boot.test.autoconfigure.properties.PropertyMapping;
public @interface AutoConfigureTestDatabase {
/**
* If the test database should replace any existing.
* Determines what type of existing DataSource beans can be replaced.
* @return the type of existing DataSource to replace
*/
Replace replace() default Replace.ANY;
/**
* The type of connection to be establish when {@link #replace() replacing} the data
* source. By default will attempt to detect the connection based on the classpath.
* @return the type of connection to use
*/
EmbeddedDatabaseConnection connection() default EmbeddedDatabaseConnection.NONE;

4
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java
View File

@@ -69,6 +69,7 @@ public @interface DataJpaTest {
/**
* If SQL output should be logged.
* @return if SQL is logged
*/
@PropertyMapping("spring.jpa.show-sql")
boolean showSql() default true;
@@ -79,18 +80,21 @@ public @interface DataJpaTest {
* included.
* @see #includeFilters()
* @see #excludeFilters()
* @return if default filters should be used
*/
boolean useDefaultFilters() default true;
/**
* A set of include filters which can be used to add otherwise filtered beans to the
* application context.
* @return include filters to apply
*/
Filter[] includeFilters() default {};
/**
* A set of exclude filters which can be used to filter beans that would otherwise be
* added to the application context.
* @return exclude filters to apply
*/
Filter[] excludeFilters() default {};

2
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/PropertyMapping.java
View File

@@ -58,6 +58,7 @@ public @interface PropertyMapping {
* Defines the property mapping. When used at the type-level, this value will be used
* as a prefix for all mapped attributes. When used on an attribute, the value
* overrides the generated (kebab case) name.
* @return the property mapping
*/
String value() default "";
@@ -65,6 +66,7 @@ public @interface PropertyMapping {
* Determines if mapping should occur. When specified at the type-level indicates if
* mapping should occur by default or not. When used at the attribute-level, overrides
* the type-level default.
* @return if mapping should occur
*/
boolean map() default true;

4
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/AutoConfigureMockMvc.java
View File

@@ -51,18 +51,21 @@ public @interface AutoConfigureMockMvc {
/**
* If filters from the application context should be registered with MockMVC. Defaults
* to {@code true}.
* @return if filters should be added
*/
boolean addFilters() default true;
/**
* If {@link MvcResult} information should always be printed after each MockMVC
* invocation. Defaults to {@code true}.
* @return if result information is always printed
*/
boolean alwaysPrint() default true;
/**
* If a {@link WebClient} should be auto-configured when HtmlUnit is on the classpath.
* Defaults to {@code true}.
* @return if a {@link WebClient} is auto-configured
*/
@PropertyMapping("webclient.enabled")
boolean webClientEnabled() default true;
@@ -70,6 +73,7 @@ public @interface AutoConfigureMockMvc {
/**
* If a {@link WebDriver} should be auto-configured when Selenium is on the classpath.
* Defaults to {@code true}.
* @return if a {@link WebDriver} is auto-configured
*/
@PropertyMapping("webdriver.enabled")
boolean webDriverEnabled() default true;

5
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java
View File

@@ -78,6 +78,7 @@ public @interface WebMvcTest {
* can be used for brevity if no other attributes are defined. See
* {@link #controllers()} for details.
* @see #controllers()
* @return the controllers to test
*/
@AliasFor("controllers")
Class<?>[] value() default {};
@@ -86,6 +87,7 @@ public @interface WebMvcTest {
* Specifies the controllers to test. May be left blank if all {@code @Controller}
* beans should be added to the application context.
* @see #value()
* @return the controllers to test
*/
@AliasFor("value")
Class<?>[] controllers() default {};
@@ -98,18 +100,21 @@ public @interface WebMvcTest {
* included.
* @see #includeFilters()
* @see #excludeFilters()
* @return if default filters should be used
*/
boolean useDefaultFilters() default true;
/**
* A set of include filters which can be used to add otherwise filtered beans to the
* application context.
* @return include filters to apply
*/
Filter[] includeFilters() default {};
/**
* A set of exclude filters which can be used to filter beans that would otherwise be
* added to the application context.
* @return exclude filters to apply
*/
Filter[] excludeFilters() default {};