Browse Source

Narrow auto-configure checkstyle suppressions

Closes gh-21015
pull/24789/head
Phillip Webb 5 years ago
parent
commit
286ef61071
  1. 3
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureOrder.java
  2. 4
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java
  3. 5
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cloud/CloudServiceConnectorsAutoConfiguration.java
  4. 10
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java
  5. 8
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfiguration.java
  6. 6
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java
  7. 4
      src/checkstyle/checkstyle-suppressions.xml

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureOrder.java

@ -48,6 +48,9 @@ import org.springframework.core.annotation.Order; @@ -48,6 +48,9 @@ import org.springframework.core.annotation.Order;
@Documented
public @interface AutoConfigureOrder {
/**
* The default order value.
*/
int DEFAULT_ORDER = 0;
/**

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java

@ -83,6 +83,10 @@ import org.springframework.core.io.support.SpringFactoriesLoader; @@ -83,6 +83,10 @@ import org.springframework.core.io.support.SpringFactoriesLoader;
@Import(AutoConfigurationImportSelector.class)
public @interface EnableAutoConfiguration {
/**
* Environment property that can be used to override when auto-configuration is
* enabled.
*/
String ENABLED_OVERRIDE_PROPERTY = "spring.boot.enableautoconfiguration";
/**

5
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cloud/CloudServiceConnectorsAutoConfiguration.java

@ -54,7 +54,10 @@ import org.springframework.core.Ordered; @@ -54,7 +54,10 @@ import org.springframework.core.Ordered;
@Import(CloudScanConfiguration.class)
public class CloudServiceConnectorsAutoConfiguration {
// Cloud configuration needs to happen early (before data, mongo etc.)
/**
* The order for cloud configuration. Cloud configurations need to happen early (so
* that they run before data, mongo, etc.).
*/
public static final int ORDER = Ordered.HIGHEST_PRECEDENCE + 20;
private static final Log logger = LogFactory.getLog(CloudServiceConnectorsAutoConfiguration.class);

10
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java

@ -400,18 +400,28 @@ public final class ConditionMessage { @@ -400,18 +400,28 @@ public final class ConditionMessage {
*/
public enum Style {
/**
* Render with normal styling.
*/
NORMAL {
@Override
protected Object applyToItem(Object item) {
return item;
}
},
/**
* Render with the item surrounded by quotes.
*/
QUOTE {
@Override
protected String applyToItem(Object item) {
return (item != null) ? "'" + item + "'" : null;
}
};
public Collection<?> applyTo(Collection<?> items) {

8
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfiguration.java

@ -70,13 +70,13 @@ import org.springframework.web.servlet.DispatcherServlet; @@ -70,13 +70,13 @@ import org.springframework.web.servlet.DispatcherServlet;
@AutoConfigureAfter(ServletWebServerFactoryAutoConfiguration.class)
public class DispatcherServletAutoConfiguration {
/*
* The bean name for a DispatcherServlet that will be mapped to the root URL "/"
/**
* The bean name for a DispatcherServlet that will be mapped to the root URL "/".
*/
public static final String DEFAULT_DISPATCHER_SERVLET_BEAN_NAME = "dispatcherServlet";
/*
* The bean name for a ServletRegistrationBean for the DispatcherServlet "/"
/**
* The bean name for a ServletRegistrationBean for the DispatcherServlet "/".
*/
public static final String DEFAULT_DISPATCHER_SERVLET_REGISTRATION_BEAN_NAME = "dispatcherServletRegistration";

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java

@ -141,8 +141,14 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver; @@ -141,8 +141,14 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver;
ValidationAutoConfiguration.class })
public class WebMvcAutoConfiguration {
/**
* The default Spring MVC view prefix.
*/
public static final String DEFAULT_PREFIX = "";
/**
* The default Spring MVC view suffix.
*/
public static final String DEFAULT_SUFFIX = "";
private static final String[] SERVLET_LOCATIONS = { "/" };

4
src/checkstyle/checkstyle-suppressions.xml

@ -15,8 +15,8 @@ @@ -15,8 +15,8 @@
<suppress files="[\\/]src[\\/]test[\\/]java[\\/]" checks="Javadoc*" />
<suppress files="[\\/]src[\\/]test[\\/]java[\\/]" id="mainCodeIllegalImportCheck" />
<suppress files="[\\/]src[\\/]test[\\/]java[\\/]" checks="NonEmptyAtclauseDescription" />
<suppress files="[\\/]autoconfigure[\\/]" checks="JavadocType" />
<suppress files="[\\/]autoconfigure[\\/]" checks="JavadocVariable" />
<suppress files="[\\/]autoconfigure[\\/].*Properties\.java" checks="JavadocType" />
<suppress files="[\\/]autoconfigure[\\/].*Properties\.java" checks="JavadocVariable" />
<suppress files="[\\/]spring-boot-docs[\\/]" checks="JavadocType" />
<suppress files="[\\/]spring-boot-smoke-tests[\\/]" checks="JavadocType" />
<suppress files="[\\/]spring-boot-smoke-tests[\\/]" checks="ImportControl" />

Loading…
Cancel
Save