minor: renaming to comply with new config rules in main repo

nrmancuso · romani · commit f3b1a080ea95 · 2022-04-10T11:09:46.000-07:00
diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/annotation/ForbidAnnotationCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/annotation/ForbidAnnotationCheck.java
@@ -79,8 +79,8 @@ public void setAnnotationNames(final String... names) {
     public void setAnnotationTargets(String... targets) {
         if (targets != null) {
             annotationTargets = new int[targets.length];
-            for (int i = 0; i < targets.length; i++) {
-                annotationTargets[i] = TokenUtil.getTokenId(targets[i]);
+            for (int index = 0; index < targets.length; index++) {
+                annotationTargets[index] = TokenUtil.getTokenId(targets[index]);
             }
             Arrays.sort(annotationTargets);
         }
diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/AvoidConstantAsFirstOperandInConditionCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/AvoidConstantAsFirstOperandInConditionCheck.java
@@ -85,8 +85,8 @@ public class AvoidConstantAsFirstOperandInConditionCheck extends AbstractCheck {
     public void setTargetConstantTypes(String... targets) {
         if (targets != null) {
             targetConstantTypes = new int[targets.length];
-            for (int i = 0; i < targets.length; i++) {
-                targetConstantTypes[i] = TokenUtil.getTokenId(targets[i]);
+            for (int index = 0; index < targets.length; index++) {
+                targetConstantTypes[index] = TokenUtil.getTokenId(targets[index]);
             }
             Arrays.sort(targetConstantTypes);
         }
diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/CustomDeclarationOrderCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/CustomDeclarationOrderCheck.java
@@ -337,9 +337,9 @@ public int[] getDefaultTokens() {
         final int size = customOrderDeclaration.size();
         final int[] tokenTypes = new int[size + 1];
 
-        for (int i = 0; i < size; i++) {
-            final FormatMatcher currentRule = customOrderDeclaration.get(i);
-            tokenTypes[i] = currentRule.getClassMember();
+        for (int index = 0; index < size; index++) {
+            final FormatMatcher currentRule = customOrderDeclaration.get(index);
+            tokenTypes[index] = currentRule.getClassMember();
 
             if (currentRule.hasRule(INNER_CLASS_MACRO)) {
                 checkInnerClasses = true;
@@ -1371,8 +1371,8 @@ public Map<DetailAST, DetailAST> getWrongOrderedGettersSetters() {
                 // sort by line numbers
                 Collections.sort(allGettersSetters, AST_LINE_COMPARATOR);
 
-                for (int i = 0; i < allGettersSetters.size(); i++) {
-                    result.putAll(getWrongOrderedGettersSetters(allGettersSetters, i));
+                for (int index = 0; index < allGettersSetters.size(); index++) {
+                    result.putAll(getWrongOrderedGettersSetters(allGettersSetters, index));
                 }
             }
             return result;
@@ -1402,17 +1402,19 @@ else if (isBooleanGetterName(getterName)) {
 
             if (getterField != null) {
                 // review rest of the list to find a proper setter
-                for (int j = 0; j < allGettersSetters.size(); j++) {
-                    if (index != j) {
+                for (int allGettersSettersIndex = 0;
+                     allGettersSettersIndex < allGettersSetters.size();
+                     allGettersSettersIndex++) {
+                    if (index != allGettersSettersIndex) {
                         // method is NOT getter
-                        final DetailAST setterAst = allGettersSetters.get(j);
+                        final DetailAST setterAst = allGettersSetters.get(allGettersSettersIndex);
                         final String setterName = getIdentifier(setterAst);
                         if (isSetterName(setterName)) {
                             final String setterField = getNameWithoutPrefix(
                                     getIdentifier(setterAst), SETTER_PREFIX);
 
                             // if fields are same and setter is sibling with getter
-                            if (j != index + 1
+                            if (allGettersSettersIndex != index + 1
                                     && getterField.equals(setterField)) {
                                 result.put(setterAst, getterAst);
                                 break;
diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/IllegalCatchExtendedCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/IllegalCatchExtendedCheck.java
@@ -185,8 +185,8 @@ private static DetailAST[] getChilds(DetailAST node) {
 
         DetailAST currNode = node.getFirstChild();
 
-        for (int i = 0; i < result.length; i++) {
-            result[i] = currNode;
+        for (int index = 0; index < result.length; index++) {
+            result[index] = currNode;
             currNode = currNode.getNextSibling();
         }
 
diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/NumericLiteralNeedsUnderscoreCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/NumericLiteralNeedsUnderscoreCheck.java
@@ -581,8 +581,8 @@ private static boolean numericSegmentPassesRequirement(String numericSegment,
             final char underscore = '_';
             int symbolCount = 0;
 
-            for (int i = 0; i < numericSegment.length(); i++) {
-                final char current = numericSegment.charAt(i);
+            for (int index = 0; index < numericSegment.length(); index++) {
+                final char current = numericSegment.charAt(index);
                 if (symbolCount >= symbolsUntilUnderscore && current != underscore) {
                     passes = false;
                     break;
diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/RequireFailForTryCatchInJunitCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/RequireFailForTryCatchInJunitCheck.java
@@ -345,8 +345,8 @@ private boolean isTestMethod(DetailAST method) {
         boolean result = false;
         if (method != null) {
             result = importTest && AnnotationUtil.containsAnnotation(method, "Test");
-            for (int i = 0; !result && i < FQ_JUNIT_TESTS.size(); i++) {
-                result = AnnotationUtil.containsAnnotation(method, FQ_JUNIT_TESTS.get(i));
+            for (int index = 0; !result && index < FQ_JUNIT_TESTS.size(); index++) {
+                result = AnnotationUtil.containsAnnotation(method, FQ_JUNIT_TESTS.get(index));
             }
         }
         return result;
diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/SimpleAccessorNameNotationCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/SimpleAccessorNameNotationCheck.java
@@ -357,7 +357,7 @@ private static boolean checkNameOfParameters(DetailAST parameters,
         final DetailAST parameterDef = parameters
                 .findFirstToken(TokenTypes.PARAMETER_DEF);
 
-        for (int i = 0; i < parametersChildCount && !isNameOfParameter; i++) {
+        for (int index = 0; index < parametersChildCount && !isNameOfParameter; index++) {
             isNameOfParameter = parameterDef.findFirstToken(TokenTypes.IDENT).getText()
                     .equals(fieldName);
         }
diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/TernaryPerExpressionCountCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/TernaryPerExpressionCountCheck.java
@@ -251,10 +251,10 @@ private boolean isIsolatedTernaryOnLine(DetailAST questionAST) {
     private boolean isSingleTernaryLine(String line, int lineNo) {
         int questionsPerLine = 0;
         final char[] charArrayFromLine = line.toCharArray();
-        for (int i = 0; i < line.length(); i++) {
-            final char currentSymbol = charArrayFromLine[i];
+        for (int index = 0; index < line.length(); index++) {
+            final char currentSymbol = charArrayFromLine[index];
             if (currentSymbol == '?' && !getFileContents().hasIntersectionWithComment(lineNo + 1,
-                    i, lineNo + 1, i)) {
+                    index, lineNo + 1, index)) {
                 questionsPerLine++;
             }
             if (questionsPerLine > 1) {
diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/UnnecessaryParenthesesExtendedCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/UnnecessaryParenthesesExtendedCheck.java
@@ -324,8 +324,8 @@ private static boolean inTokenList(int type, int... tokens) {
         //       HashMap to do the searches.
 
         boolean found = false;
-        for (int i = 0; i < tokens.length && !found; i++) {
-            found = tokens[i] == type;
+        for (int index = 0; index < tokens.length && !found; index++) {
+            found = tokens[index] == type;
         }
         return found;
     }
diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/design/ChildBlockLengthCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/design/ChildBlockLengthCheck.java
@@ -104,8 +104,8 @@ public class ChildBlockLengthCheck extends AbstractCheck {
      **/
     public void setBlockTypes(final String... blockTypes) {
         this.blockTypes = new int[blockTypes.length];
-        for (int i = 0; i < blockTypes.length; i++) {
-            this.blockTypes[i] = TokenUtil.getTokenId(blockTypes[i]);
+        for (int index = 0; index < blockTypes.length; index++) {
+            this.blockTypes[index] = TokenUtil.getTokenId(blockTypes[index]);
         }
     }
 
diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/naming/UniformEnumConstantNameCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/naming/UniformEnumConstantNameCheck.java
@@ -219,11 +219,11 @@ private void logViolation(DetailAST member, String enumName, BitSet violated) {
      */
     private BitSet match(String name, BitSet conformedPatterns) {
         final BitSet result = new BitSet(patternCount);
-        for (int i = 0; i < patterns.size(); i++) {
-            if (conformedPatterns.get(i)) {
-                final Pattern pattern = patterns.get(i);
+        for (int index = 0; index < patterns.size(); index++) {
+            if (conformedPatterns.get(index)) {
+                final Pattern pattern = patterns.get(index);
                 if (pattern.matcher(name).find()) {
-                    result.set(i);
+                    result.set(index);
                 }
             }
         }
diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/sizes/LineLengthExtendedCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/sizes/LineLengthExtendedCheck.java
@@ -231,17 +231,17 @@ public void beginTree(DetailAST rootAST) {
 
     @Override
     public void finishTree(DetailAST rootAST) {
-        for (int i = 0; i < lines.length; i++) {
-            if (lines[i] == null) {
+        for (int index = 0; index < lines.length; index++) {
+            if (lines[index] == null) {
                 continue;
             }
 
-            final String line = lines[i];
+            final String line = lines[index];
             final int realLength = CommonUtil.lengthExpandedTabs(line,
                     line.length(), getTabWidth());
 
             if (realLength > max && !ignorePattern.matcher(line).find()) {
-                log(i + 1, MSG_KEY, max, realLength);
+                log(index + 1, MSG_KEY, max, realLength);
             }
         }
     }
diff --git a/sevntu-checks/src/test/java/com/github/sevntu/checkstyle/internal/CheckUtil.java b/sevntu-checks/src/test/java/com/github/sevntu/checkstyle/internal/CheckUtil.java
@@ -81,8 +81,8 @@ public static Set<String> getCheckStyleChecksReferencedInConfig(String configFil
             final NodeList nodeList = document.getElementsByTagName("module");
 
             final Set<String> checksReferencedInCheckstyleChecksXml = new HashSet<>();
-            for (int i = 0; i < nodeList.getLength(); i++) {
-                final Node currentNode = nodeList.item(i);
+            for (int index = 0; index < nodeList.getLength(); index++) {
+                final Node currentNode = nodeList.item(index);
                 if (currentNode.getNodeType() == Node.ELEMENT_NODE) {
                     final Element module = (Element) currentNode;
                     final String checkName = module.getAttribute("name");
diff --git a/sevntu-checks/src/test/java/com/github/sevntu/checkstyle/internal/ChecksTest.java b/sevntu-checks/src/test/java/com/github/sevntu/checkstyle/internal/ChecksTest.java
@@ -75,18 +75,20 @@ public void verifyTestConfigurationFiles() throws Exception {
 
         // eclipsecs
 
-        for (String p : packages) {
+        for (String packageName : packages) {
             Assertions.assertTrue(new File(
-                    getEclipseCsPath(p)).exists(), "folder " + p + " must exist in eclipsecs");
+                    getEclipseCsPath(packageName)).exists(), "folder " + packageName
+                    + " must exist in eclipsecs");
 
-            final Set<Class<?>> pkgModules = CheckUtil.getModulesInPackage(modules, p);
+            final Set<Class<?>> pkgModules = CheckUtil.getModulesInPackage(modules, packageName);
 
             validateEclipseCsMetaXmlFile(
-                    new File(getEclipseCsPath(p + "/checkstyle-metadata.xml")), p, new HashSet<>(
+                    new File(getEclipseCsPath(packageName
+                            + "/checkstyle-metadata.xml")), packageName, new HashSet<>(
                             pkgModules));
 
-            validateEclipseCsMetaPropFile(new File(getEclipseCsPath(p
-                    + "/checkstyle-metadata.properties")), p, new HashSet<>(pkgModules));
+            validateEclipseCsMetaPropFile(new File(getEclipseCsPath(packageName
+                    + "/checkstyle-metadata.properties")), packageName, new HashSet<>(pkgModules));
         }
     }
 
@@ -389,9 +391,9 @@ private static Set<String> getProperties(Class<?> clss) {
         final Set<String> result = new TreeSet<>();
         final PropertyDescriptor[] map = PropertyUtils.getPropertyDescriptors(clss);
 
-        for (PropertyDescriptor p : map) {
-            if (p.getWriteMethod() != null) {
-                result.add(p.getName());
+        for (PropertyDescriptor descriptor : map) {
+            if (descriptor.getWriteMethod() != null) {
+                result.add(descriptor.getName());
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,8 @@ public void setAnnotationNames(final String... names) {`
`79`	`79`	`public void setAnnotationTargets(String... targets) {`
`80`	`80`	`if (targets != null) {`
`81`	`81`	`annotationTargets = new int[targets.length];`
`82`		`- for (int i = 0; i < targets.length; i++) {`
`83`		`- annotationTargets[i] = TokenUtil.getTokenId(targets[i]);`
	`82`	`+ for (int index = 0; index < targets.length; index++) {`
	`83`	`+ annotationTargets[index] = TokenUtil.getTokenId(targets[index]);`
`84`	`84`	`}`
`85`	`85`	`Arrays.sort(annotationTargets);`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,8 @@ public class AvoidConstantAsFirstOperandInConditionCheck extends AbstractCheck {`
`85`	`85`	`public void setTargetConstantTypes(String... targets) {`
`86`	`86`	`if (targets != null) {`
`87`	`87`	`targetConstantTypes = new int[targets.length];`
`88`		`- for (int i = 0; i < targets.length; i++) {`
`89`		`- targetConstantTypes[i] = TokenUtil.getTokenId(targets[i]);`
	`88`	`+ for (int index = 0; index < targets.length; index++) {`
	`89`	`+ targetConstantTypes[index] = TokenUtil.getTokenId(targets[index]);`
`90`	`90`	`}`
`91`	`91`	`Arrays.sort(targetConstantTypes);`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,8 @@ private static DetailAST[] getChilds(DetailAST node) {`
`185`	`185`
`186`	`186`	`DetailAST currNode = node.getFirstChild();`
`187`	`187`
`188`		`- for (int i = 0; i < result.length; i++) {`
`189`		`- result[i] = currNode;`
	`188`	`+ for (int index = 0; index < result.length; index++) {`
	`189`	`+ result[index] = currNode;`
`190`	`190`	`currNode = currNode.getNextSibling();`
`191`	`191`	`}`
`192`	`192`
Original file line number	Diff line number	Diff line change
`@@ -345,8 +345,8 @@ private boolean isTestMethod(DetailAST method) {`
`345`	`345`	`boolean result = false;`
`346`	`346`	`if (method != null) {`
`347`	`347`	`result = importTest && AnnotationUtil.containsAnnotation(method, "Test");`
`348`		`- for (int i = 0; !result && i < FQ_JUNIT_TESTS.size(); i++) {`
`349`		`- result = AnnotationUtil.containsAnnotation(method, FQ_JUNIT_TESTS.get(i));`
	`348`	`+ for (int index = 0; !result && index < FQ_JUNIT_TESTS.size(); index++) {`
	`349`	`+ result = AnnotationUtil.containsAnnotation(method, FQ_JUNIT_TESTS.get(index));`
`350`	`350`	`}`
`351`	`351`	`}`
`352`	`352`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ private static boolean checkNameOfParameters(DetailAST parameters,`
`357`	`357`	`final DetailAST parameterDef = parameters`
`358`	`358`	`.findFirstToken(TokenTypes.PARAMETER_DEF);`
`359`	`359`
`360`		`- for (int i = 0; i < parametersChildCount && !isNameOfParameter; i++) {`
	`360`	`+ for (int index = 0; index < parametersChildCount && !isNameOfParameter; index++) {`
`361`	`361`	`isNameOfParameter = parameterDef.findFirstToken(TokenTypes.IDENT).getText()`
`362`	`362`	`.equals(fieldName);`
`363`	`363`	`}`
Original file line number	Diff line number	Diff line change
`@@ -324,8 +324,8 @@ private static boolean inTokenList(int type, int... tokens) {`
`324`	`324`	`// HashMap to do the searches.`
`325`	`325`
`326`	`326`	`boolean found = false;`
`327`		`- for (int i = 0; i < tokens.length && !found; i++) {`
`328`		`- found = tokens[i] == type;`
	`327`	`+ for (int index = 0; index < tokens.length && !found; index++) {`
	`328`	`+ found = tokens[index] == type;`
`329`	`329`	`}`
`330`	`330`	`return found;`
`331`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,8 @@ public class ChildBlockLengthCheck extends AbstractCheck {`
`104`	`104`	`**/`
`105`	`105`	`public void setBlockTypes(final String... blockTypes) {`
`106`	`106`	`this.blockTypes = new int[blockTypes.length];`
`107`		`- for (int i = 0; i < blockTypes.length; i++) {`
`108`		`- this.blockTypes[i] = TokenUtil.getTokenId(blockTypes[i]);`
	`107`	`+ for (int index = 0; index < blockTypes.length; index++) {`
	`108`	`+ this.blockTypes[index] = TokenUtil.getTokenId(blockTypes[index]);`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`