GitHub-Spring
/
spring-authorization-server
mirror of https://github.com/spring-projects/spring-authorization-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Apply Spring checkstyle conventions 

Issue gh-1624
1.1.x
Joe Grandja 2 years ago
parent
9219125b14
commit
1dd0ab0c5f
4 changed files with 21 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      etc/checkstyle/checkstyle-suppressions.xml
  2. 57
      etc/checkstyle/checkstyle.xml
  3. 2
      etc/checkstyle/header.txt
  4. 19
      etc/checkstyle/suppressions.xml

8
etc/checkstyle/checkstyle-suppressions.xml
Unescape View File

@ -0,0 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE suppressions PUBLIC
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions>
<suppress files=".*" checks="JavadocStyle" />
<suppress files="SpringAuthorizationServerVersion\.java" checks="HideUtilityClassConstructor"/>
</suppressions>

57
etc/checkstyle/checkstyle.xml
Unescape View File

@ -1,51 +1,18 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" <!DOCTYPE module PUBLIC
"https://www.puppycrawl.com/dtds/configuration_1_3.dtd"> "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
<module name="Checker"> "https://checkstyle.org/dtds/configuration_1_3.dtd">
<!-- Suppressions --> <module name="com.puppycrawl.tools.checkstyle.Checker">
<module name="SuppressionFilter"> <module name="SuppressionFilter">
<property name="file" value="${config_loc}/suppressions.xml"/> <property name="file"
value="${config_loc}/checkstyle-suppressions.xml" />
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.header.RegexpHeaderCheck">
<!-- Root Checks --> <property name="headerFile" value="${config_loc}/header.txt" />
<module name="RegexpHeader"> <property name="fileExtensions" value="java" />
<property name="headerFile" value="${config_loc}/header.txt"/>
<property name="fileExtensions" value="java"/>
</module> </module>
<module name="io.spring.javaformat.checkstyle.SpringChecks">
<!-- Root Checks --> <property name="excludes" value="io.spring.javaformat.checkstyle.check.SpringHeaderCheck" />
<module name="TreeWalker"> <property name="excludes" value="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck" />
<!-- Annotations -->
<module name="MissingOverrideCheck" />
<!-- Coding -->
<module name="EmptyStatementCheck" />
<module name="RedundantModifier" />
<!-- Imports -->
<module name="UnusedImportsCheck">
<property name="processJavadoc" value="true" />
</module>
<!-- Regexp -->
<module name="RegexpSinglelineJava">
<property name="format" value="^\t* +\t*\S"/>
<property name="message" value="Line has leading space characters; indentation should be performed with tabs only."/>
<property name="ignoreComments" value="true"/>
</module>
<module name="RegexpSinglelineJava">
<property name="maximum" value="0"/>
<property name="format" value="org\.junit\.Assert\.assert"/>
<property name="message" value="Please use AssertJ imports."/>
<property name="ignoreComments" value="true"/>
</module>
<module name="Regexp">
<property name="format" value="[ \t]+$"/>
<property name="illegalPattern" value="true"/>
<property name="message" value="Trailing whitespace"/>
</module>
<!-- Whitespace -->
<module name="WhitespaceAfterCheck" />
</module> </module>
</module> </module>

2
etc/checkstyle/header.txt
Unescape View File

@ -1,5 +1,5 @@
^\Q/*\E$ ^\Q/*\E$
^\Q * Copyright\E (\d{4}(\-\d{4})? the original author or authors\.|(\d{4}, )*(\d{4}) Acegi Technology Pty Limited)$ ^\Q * Copyright \E20\d\d\-20\d\d\Q the original author or authors.\E$
^\Q *\E$ ^\Q *\E$
^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$ ^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$
^\Q * you may not use this file except in compliance with the License.\E$ ^\Q * you may not use this file except in compliance with the License.\E$

19
etc/checkstyle/suppressions.xml
Unescape View File

@ -1,19 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN"
"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
<suppressions>
<suppress files=".+Application\.java" checks="HideUtilityClassConstructor"/>
<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor"/>
<suppress files="[\\/]BCrypt(Tests)?\.java" checks="RegexpHeader"/>
<suppress files="[\\/]src[\\/]test[\\/]java[\\/]" checks="Javadoc"/>
<suppress files="[\\/]src[\\/]integration-test[\\/]java[\\/]" checks="Javadoc"/>
<suppress files="[\\/]docs[\\/]" checks="Javadoc"/>
<suppress files="[\\/]docs[\\/]" checks="CommentsIndentation"/>
<suppress files="[\\/]docs[\\/]" checks="InnerTypeLast"/>
<suppress files="[\\/]samples[\\/]" checks="Javadoc"/>
<suppress files="[\\/]samples[\\/]" checks="CommentsIndentation"/>
<suppress files="[\\/]samples[\\/]" checks="InnerTypeLast"/>
</suppressions>
Write Preview
Loading…
Cancel
Save