Skip to content

Checkstyle update #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nbirillo merged 8 commits into from
Jul 14, 2021
Merged

Checkstyle update #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0418be4
Updated distribution
GirZ0n Jul 14, 2021
77f1236
Updated config
GirZ0n Jul 14, 2021
4b34317
Updated checkstyle.jar
GirZ0n Jul 14, 2021
084c85b
Fixed tests
GirZ0n Jul 14, 2021
9fe082f
Updated whitelist
GirZ0n Jul 14, 2021
96dc86e
Typo fix
GirZ0n Jul 14, 2021
24a89fd
Small fix
GirZ0n Jul 14, 2021
caeffff
Small fix
GirZ0n Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions src/python/review/inspectors/checkstyle/checkstyle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
class CheckstyleInspector(BaseInspector):
inspector_type = InspectorType.CHECKSTYLE

skipped_issues = [
'EmptyLineSeparatorCheck',
]

origin_class_to_pattern = {
'CyclomaticComplexityCheck':
r'Cyclomatic Complexity is (\d+)',
Expand Down Expand Up @@ -52,14 +48,10 @@ def inspect(self, path: Path, config: dict) -> List[BaseIssue]:
command = self._create_command(path, output_path)
run_in_subprocess(command)

issues = parse_checkstyle_file_result(Path(output_path),
self.inspector_type,
self.choose_issue_type,
self.origin_class_to_pattern)
return [
issue for issue in issues
if issue.origin_class not in self.skipped_issues
]
return parse_checkstyle_file_result(Path(output_path),
self.inspector_type,
self.choose_issue_type,
self.origin_class_to_pattern)

@classmethod
def choose_issue_type(cls, check_class: str) -> IssueType:
Expand Down
Binary file modified src/python/review/inspectors/checkstyle/files/checkstyle.jar
View file
Open in desktop
Binary file not shown.
98 changes: 37 additions & 61 deletions src/python/review/inspectors/checkstyle/files/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,15 @@
"https://checkstyle.org/dtds/configuration_1_3.dtd">

<module name="Checker">
<property name="fileExtensions" value="java, properties, xml"/>
<property name="fileExtensions" value="java"/>

<!-- Checks whether files end with a new line. -->
<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
<!-- <module name="NewlineAtEndOfFile"/>-->

<!-- Miscellaneous other checks. -->
<!-- See http://checkstyle.sf.net/config_misc.html -->
<!-- <module name="RegexpSingleline">-->
<!-- <property name="format" value="\s+$"/>-->
<!-- <property name="minimum" value="0"/>-->
<!-- <property name="maximum" value="0"/>-->
<!-- <property name="message" value="Line has trailing spaces."/>-->
<!-- </module>-->
<!-- Size Violations -->
<module name="LineLength">
<property name="max" value="120"/>
</module>

<module name="TreeWalker">
<!-- <module name="SuppressionCommentFilter"/>-->

<!-- Checks for blocks. You know, those {}'s -->
<!-- See http://checkstyle.sf.net/config_blocks.html -->
<!-- Block Checks -->
<module name="AvoidNestedBlocks">
<property name="allowInSwitchCase" value="true"/>
</module>
Expand All @@ -33,19 +22,21 @@
<module name="NeedBraces"/>
<module name="RightCurly"/>

<!-- Checks for common coding problems -->
<!-- See http://checkstyle.sf.net/config_coding.html -->
<!-- Coding -->
<module name="ArrayTrailingComma"/>
<module name="CovariantEquals"/>
<module name="DefaultComesLast"/>
<module name="EmptyStatement"/>
<module name="EqualsAvoidNull"/>
<module name="EqualsHashCode"/>
<module name="FallThrough"/>
<module name="MagicNumber"/>
<module name="MissingSwitchDefault"/>
<module name="ModifiedControlVariable"/>
<module name="MultipleStringLiterals">
<property name="allowedDuplicates" value="2"/>
<property name="ignoreStringsRegexp" value="^.{1,5}$"/>
<!-- Consistent with the AvoidDuplicateLiterals rule from PMD config -->
<property name="allowedDuplicates" value="3"/>
<property name="ignoreStringsRegexp" value="^.{1,2}$"/>
</module>
<module name="MultipleVariableDeclarations"/>
<module name="NoFinalizer"/>
Expand All @@ -57,34 +48,35 @@
<module name="StringLiteralEquality"/>
<module name="UnnecessaryParentheses"/>

<!-- <module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/> Since Checkstyle 8.24 -->
<!-- <module name="VariableDeclarationUsageDistance"/>-->

<!-- Checks for imports -->
<!-- See http://checkstyle.sf.net/config_import.html -->
<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
<!-- Imports -->
<module name="RedundantImport"/>
<module name="UnusedImports">
<property name="processJavadoc" value="false"/>
</module>

<!-- Miscellaneous other checks -->
<!-- See http://checkstyle.sf.net/config_misc.html -->
<!-- Metrics -->
<module name="BooleanExpressionComplexity">
<property name="max" value="0"/>
</module>
<module name="CyclomaticComplexity">
<property name="max" value="0"/>
<property name="switchBlockAsSingleDecisionPoint" value="true"/>
</module>
<module name="JavaNCSS">
<property name="methodMaximum" value="0"/>
</module>

<!-- Miscellaneous -->
<module name="ArrayTypeStyle"/>
<module name="TodoComment"/>
<module name="UpperEll"/>
<module name="CommentsIndentation"/>
<module name="Indentation"/>
<module name="UpperEll"/>

<!-- Modifier Checks -->
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
<!-- Modifiers -->
<module name="ModifierOrder"/>
<!-- <module name="RedundantModifier"/>-->

<!-- Checks for Naming Conventions. -->
<!-- See http://checkstyle.sf.net/config_naming.html -->
<module name="AbbreviationAsWordInName">
<property name="allowedAbbreviationLength" value="3"/>
</module>
<!-- Naming Conventions -->
<module name="AbbreviationAsWordInName"/>
<module name="ConstantName">
<property name="format" value="^log(ger)?$|^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
</module>
Expand All @@ -98,16 +90,13 @@
<module name="StaticVariableName"/>
<module name="TypeName"/>

<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
<module name="LineLength">
<property name="max" value="120"/>
<!-- Size Violations -->
<module name="ParameterNumber">
<!-- Consistent with the ExcessiveParameterList rule from PMD config -->
<property name="max" value="9"/>
</module>
<!-- <module name="MethodLength"/>-->
<module name="ParameterNumber"/>

<!-- Checks for whitespace -->
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
<!-- Whitespaces -->
<module name="EmptyForIteratorPad"/>
<module name="EmptyLineSeparator">
<property name="allowNoEmptyLineBetweenFields" value="true"/>
Expand All @@ -118,27 +107,14 @@
<module name="NoWhitespaceBefore"/>
<module name="OperatorWrap">
<property name="tokens"
value="ASSIGN,DIV_ASSIGN,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,MOD_ASSIGN,
value="ASSIGN,DIV_ASSIGN,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,MOD_ASSIGN,
SR_ASSIGN,BSR_ASSIGN,SL_ASSIGN,BXOR_ASSIGN,BOR_ASSIGN,BAND_ASSIGN"/>
<property name="option" value="eol"/>
</module>

<module name="ParenPad"/>
<module name="TypecastParenPad"/>
<module name="WhitespaceAfter"/>
<module name="WhitespaceAround"/>

<!-- Metrics -->
<module name="BooleanExpressionComplexity">
<property name="max" value="0"/>
</module>
<module name="JavaNCSS">
<property name="methodMaximum" value="0"/>
</module>
<module name="CyclomaticComplexity">
<property name="max" value="0"/>
<property name="switchBlockAsSingleDecisionPoint" value="true"/>
</module>

</module>
</module>
Loading