Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 3 additions & 32 deletions config/checkstyle_input_suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,44 +48,15 @@
<suppress id="StyleValidationCommentInInputs"
files="packageobjectfactory[\\/].*.java"/>

<!-- until https://github.com/checkstyle/checkstyle/issues/10737 -->

<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]suppressioncommentfilter[\\/]InputSuppressionCommentFilter.java"/>

<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]suppressioncommentfilter[\\/]InputSuppressionCommentFilterSuppressById.java"/>

<!-- SuppressionXpathFilterTest, SuppressionXpathSingleFilterTest and XpathFilterElementTest
use assertions directly instead of using them through parser or the traditional
verify method -->
<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]suppressionxpathfilter[\\/]InputSuppressionXpathFilter.java"/>

<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]suppressionxpathsinglefilter[\\/]InputSuppressionXpathSingleFilter.java"/>

<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]suppresswarningsfilter[\\/]InputSuppressWarningsFilterById.java"/>

<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]suppresswarningsfilter[\\/]InputSuppressWarningsFilter.java"/>

<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]suppresswithnearbycommentfilter[\\/]InputSuppressWithNearbyCommentFilterById.java"/>

<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]suppresswithnearbycommentfilter[\\/]InputSuppressWithNearbyCommentFilter.java"/>

<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]suppresswithplaintextcommentfilter[\\/]InputSuppressWithPlainTextCommentFilterCustomMessageFormat.java"/>

<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]suppresswithplaintextcommentfilter[\\/]InputSuppressWithPlainTextCommentFilterSuppressById.java"/>

<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]suppresswithplaintextcommentfilter[\\/]InputSuppressWithPlainTextCommentFilterWithCustomOnAndOffComments.java"/>

<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]suppresswithplaintextcommentfilter[\\/]InputSuppressWithPlainTextCommentFilterWithDefaultCfg.java"/>

<suppress id="StyleValidationCommentInInputs"
files="filters[\\/]xpathfilterelement[\\/]InputXpathFilterElementSuppressByXpath.java"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,6 @@ private void modifyVariablesStack(TypeDeclDesc obtainedClass,

/**
* Checks if there is a type declaration with same name as the super class.
* Duplicated, until <a>https://github.com/checkstyle/checkstyle/issues/11201</a>
*
* @param superClassName name of the super class
* @return true if there is another type declaration with same name.
Expand Down Expand Up @@ -622,7 +621,6 @@ private boolean hasSameNameAsSuperClass(String superClassName, TypeDeclDesc type
/**
* For all type declarations with the same name as the superclass, gets the nearest type
* declaration.
* Duplicated, until <a>https://github.com/checkstyle/checkstyle/issues/11201</a>
*
* @param outerTypeDeclName outer type declaration of anonymous inner class
* @param typeDeclWithSameName typeDeclarations which have the same name as the super class
Expand Down Expand Up @@ -660,7 +658,6 @@ private static int getTypeDeclarationNameMatchingCountDiff(String outerTypeDeclN

/**
* Get qualified type declaration name from type ast.
* Duplicated, until <a>https://github.com/checkstyle/checkstyle/issues/11201</a>
*
* @param typeDeclAst type declaration ast
* @return qualified name of type declaration
Expand Down