Skip to content

S
spring-boot
Commit 65128c0a authored by Johnny Lim's avatar Johnny Lim Committed by Phillip Webb
Browse files
Options

Remove severity elements from checkstyle.xml 

Remove `error` severity elements from `checkstyle.xml` and rely on the
default setting instead.

Closes gh-6442
parent 254b099b
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 136 deletions
spring-boot-parent/src/checkstyle/checkstyle.xml
View file @ 65128c0a
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<module name="com.puppycrawl.tools.checkstyle.Checker"> <module name="com.puppycrawl.tools.checkstyle.Checker">
<property name="severity" value="error"/>
<!-- Root Checks --> <!-- Root Checks -->
<module name="com.puppycrawl.tools.checkstyle.checks.header.RegexpHeaderCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.header.RegexpHeaderCheck">
<property name="severity" value="error"/>
<property name="headerFile" value="${checkstyle.header.file}" /> <property name="headerFile" value="${checkstyle.header.file}" />
<property name="fileExtensions" value="java" /> <property name="fileExtensions" value="java" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
<property name="severity" value="error"/>
<property name="lineSeparator" value="lf"/> <property name="lineSeparator" value="lf"/>
</module> </module>
<!-- TreeWalker Checks --> <!-- TreeWalker Checks -->
<module name="com.puppycrawl.tools.checkstyle.TreeWalker"> <module name="com.puppycrawl.tools.checkstyle.TreeWalker">
<property name="severity" value="error"/>
<!-- Annotations --> <!-- Annotations -->
<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck">
<property name="severity" value="error"/>
<property name="elementStyle" value="compact" /> <property name="elementStyle" value="compact" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.annotation.MissingOverrideCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.annotation.MissingOverrideCheck" />
<property name="severity" value="error"/> <module name="com.puppycrawl.tools.checkstyle.checks.annotation.PackageAnnotationCheck" />
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.annotation.PackageAnnotationCheck">
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck">
<property name="severity" value="error"/>
<property name="allowSamelineSingleParameterlessAnnotation" <property name="allowSamelineSingleParameterlessAnnotation"
value="false" /> value="false" />
</module> </module>
<!-- Block Checks --> <!-- Block Checks -->
<module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck">
<property name="severity" value="error"/>
<property name="option" value="text" /> <property name="option" value="text" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck" />
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck">
<property name="severity" value="error"/>
<property name="option" value="alone" /> <property name="option" value="alone" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck" />
<property name="severity" value="error"/> <module name="com.puppycrawl.tools.checkstyle.checks.blocks.AvoidNestedBlocksCheck" />
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.blocks.AvoidNestedBlocksCheck">
<property name="severity" value="error"/>
</module>
<!-- Class Design --> <!-- Class Design -->
<module name="com.puppycrawl.tools.checkstyle.checks.design.FinalClassCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.design.FinalClassCheck" />
<property name="severity" value="error"/> <module name="com.puppycrawl.tools.checkstyle.checks.design.InterfaceIsTypeCheck" />
</module> <module name="com.puppycrawl.tools.checkstyle.checks.design.HideUtilityClassConstructorCheck" />
<module name="com.puppycrawl.tools.checkstyle.checks.design.InterfaceIsTypeCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.design.MutableExceptionCheck" />
<property name="severity" value="error"/> <module name="com.puppycrawl.tools.checkstyle.checks.design.InnerTypeLastCheck" />
</module> <module name="com.puppycrawl.tools.checkstyle.checks.design.OneTopLevelClassCheck" />
<module name="com.puppycrawl.tools.checkstyle.checks.design.HideUtilityClassConstructorCheck">
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.design.MutableExceptionCheck">
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.design.InnerTypeLastCheck">
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.design.OneTopLevelClassCheck">
<property name="severity" value="error"/>
</module>
<!-- Coding --> <!-- Coding -->
<module name="com.puppycrawl.tools.checkstyle.checks.coding.CovariantEqualsCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.coding.CovariantEqualsCheck" />
<property name="severity" value="error"/> <module name="com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck" />
</module> <module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsHashCodeCheck" />
<module name="com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.coding.InnerAssignmentCheck" />
<property name="severity" value="error"/> <module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanExpressionCheck" />
</module> <module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanReturnCheck" />
<module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsHashCodeCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.coding.StringLiteralEqualityCheck" />
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.InnerAssignmentCheck">
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanExpressionCheck">
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanReturnCheck">
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.StringLiteralEqualityCheck">
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedForDepthCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedForDepthCheck">
<property name="severity" value="error"/>
<property name="max" value="3" /> <property name="max" value="3" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedIfDepthCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedIfDepthCheck">
<property name="severity" value="error"/>
<property name="max" value="3" /> <property name="max" value="3" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedTryDepthCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedTryDepthCheck">
<property name="severity" value="error"/>
<property name="max" value="3" /> <property name="max" value="3" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck" />
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck">
<property name="severity" value="error"/>
<property name="checkMethods" value="false" /> <property name="checkMethods" value="false" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck" />
<property name="severity" value="error"/>
</module>
<!-- Imports --> <!-- Imports -->
<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck" />
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStaticImportCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStaticImportCheck">
<property name="severity" value="error"/>
<property name="excludes" <property name="excludes"
value="org.assertj.core.api.Assertions.*, org.junit.Assert.*, org.junit.Assume.*, org.junit.internal.matchers.ThrowableMessageMatcher.*, org.hamcrest.CoreMatchers.*, org.hamcrest.Matchers.*, org.springframework.boot.configurationprocessor.ConfigurationMetadataMatchers.*, org.springframework.boot.configurationprocessor.TestCompiler.*, org.springframework.boot.test.autoconfigure.AutoConfigurationImportedCondition.*, org.mockito.Mockito.*, org.mockito.BDDMockito.*, org.mockito.Matchers.*, org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.*, org.springframework.restdocs.hypermedia.HypermediaDocumentation.*, org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*, org.springframework.test.web.servlet.result.MockMvcResultMatchers.*, org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*, org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*, org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo, org.springframework.test.web.client.match.MockRestRequestMatchers.*, org.springframework.test.web.client.response.MockRestResponseCreators.*" /> value="org.assertj.core.api.Assertions.*, org.junit.Assert.*, org.junit.Assume.*, org.junit.internal.matchers.ThrowableMessageMatcher.*, org.hamcrest.CoreMatchers.*, org.hamcrest.Matchers.*, org.springframework.boot.configurationprocessor.ConfigurationMetadataMatchers.*, org.springframework.boot.configurationprocessor.TestCompiler.*, org.springframework.boot.test.autoconfigure.AutoConfigurationImportedCondition.*, org.mockito.Mockito.*, org.mockito.BDDMockito.*, org.mockito.Matchers.*, org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.*, org.springframework.restdocs.hypermedia.HypermediaDocumentation.*, org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*, org.springframework.test.web.servlet.result.MockMvcResultMatchers.*, org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*, org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*, org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo, org.springframework.test.web.client.match.MockRestRequestMatchers.*, org.springframework.test.web.client.response.MockRestResponseCreators.*" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck" />
<property name="severity" value="error"/> <module name="com.puppycrawl.tools.checkstyle.checks.imports.RedundantImportCheck" />
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.imports.RedundantImportCheck">
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck">
<property name="severity" value="error"/>
<property name="processJavadoc" value="true" /> <property name="processJavadoc" value="true" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck">
<property name="severity" value="error"/>
<property name="groups" value="java,/^javax?\./,*,org.springframework" /> <property name="groups" value="java,/^javax?\./,*,org.springframework" />
<property name="ordered" value="true" /> <property name="ordered" value="true" />
<property name="separated" value="true" /> <property name="separated" value="true" />
...@@ -149,70 +86,50 @@ ...@@ -149,70 +86,50 @@
<!-- Javadoc Comments --> <!-- Javadoc Comments -->
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck">
<property name="severity" value="error"/>
<property name="scope" value="package"/> <property name="scope" value="package"/>
<property name="authorFormat" value=".+\s.+"/> <property name="authorFormat" value=".+\s.+"/>
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
<property name="severity" value="error"/>
<property name="allowMissingJavadoc" value="true" /> <property name="allowMissingJavadoc" value="true" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
<property name="severity" value="error"/>
<property name="scope" value="public"/> <property name="scope" value="public"/>
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck">
<property name="severity" value="error"/>
<property name="checkEmptyJavadoc" value="true"/> <property name="checkEmptyJavadoc" value="true"/>
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck" />
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck">
<property name="severity" value="error"/>
<property name="offset" value="0"/> <property name="offset" value="0"/>
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck">
<property name="severity" value="error"/>
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF"/> <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF"/>
<property name="tagOrder" value="@param, @author, @since, @see, @version, @serial, @deprecated"/> <property name="tagOrder" value="@param, @author, @since, @see, @version, @serial, @deprecated"/>
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck">
<property name="severity" value="error"/>
<property name="target" value="METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/> <property name="target" value="METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
<property name="tagOrder" value="@param, @return, @throws, @since, @deprecated, @see"/> <property name="tagOrder" value="@param, @return, @throws, @since, @deprecated, @see"/>
</module> </module>
<!-- Miscellaneous --> <!-- Miscellaneous -->
<module name="com.puppycrawl.tools.checkstyle.checks.indentation.CommentsIndentationCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.indentation.CommentsIndentationCheck">
<property name="severity" value="error"/>
<property name="tokens" value="BLOCK_COMMENT_BEGIN"/> <property name="tokens" value="BLOCK_COMMENT_BEGIN"/>
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck" />
<property name="severity" value="error"/> <module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck" />
</module> <module name="com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheck" />
<module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck">
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheck">
<property name="severity" value="error"/>
</module>
<!-- Modifiers --> <!-- Modifiers -->
<module name="com.puppycrawl.tools.checkstyle.checks.modifier.RedundantModifierCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.modifier.RedundantModifierCheck" />
<property name="severity" value="error"/>
</module>
<!-- Regexp --> <!-- Regexp -->
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<property name="severity" value="error"/>
<property name="format" value="^\t* +\t*\S" /> <property name="format" value="^\t* +\t*\S" />
<property name="message" <property name="message"
value="Line has leading space characters; indentation should be performed with tabs only." /> value="Line has leading space characters; indentation should be performed with tabs only." />
<property name="ignoreComments" value="true" /> <property name="ignoreComments" value="true" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<property name="severity" value="error"/>
<property name="maximum" value="0"/> <property name="maximum" value="0"/>
<property name="format" value="org\.mockito\.Mockito\.(when|doThrow|doAnswer)" /> <property name="format" value="org\.mockito\.Mockito\.(when|doThrow|doAnswer)" />
<property name="message" <property name="message"
...@@ -220,7 +137,6 @@ ...@@ -220,7 +137,6 @@
<property name="ignoreComments" value="true" /> <property name="ignoreComments" value="true" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<property name="severity" value="error"/>
<property name="maximum" value="0"/> <property name="maximum" value="0"/>
<property name="format" value="org\.junit\.Assert\.assert" /> <property name="format" value="org\.junit\.Assert\.assert" />
<property name="message" <property name="message"
...@@ -228,38 +144,21 @@ ...@@ -228,38 +144,21 @@
<property name="ignoreComments" value="true" /> <property name="ignoreComments" value="true" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpCheck">
<property name="severity" value="error"/>
<property name="format" value="[ \t]+$" /> <property name="format" value="[ \t]+$" />
<property name="illegalPattern" value="true" /> <property name="illegalPattern" value="true" />
<property name="message" value="Trailing whitespace" /> <property name="message" value="Trailing whitespace" />
</module> </module>
<!-- Whitespace --> <!-- Whitespace -->
<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck" />
<property name="severity" value="error"/> <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck" />
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck">
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck" > <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck" >
<property name="severity" value="error"/>
<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, ARRAY_DECLARATOR"/> <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, ARRAY_DECLARATOR"/>
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck" />
<property name="severity" value="error"/> <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck" />
</module> <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TypecastParenPadCheck" />
<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck" />
<property name="severity" value="error"/> <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck" />
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TypecastParenPadCheck">
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck">
<property name="severity" value="error"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck">
<property name="severity" value="error"/>
</module>
</module> </module>
</module> </module>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment