From 247addb77b0b5a2e3fc9cbc1ab1a89be47a2fc0e Mon Sep 17 00:00:00 2001 From: Christian Oyarzun Date: Tue, 23 Jun 2015 11:01:50 -0400 Subject: [PATCH] Update to checkstyle 6.7 Fixes #351 TokenTypes methods getTokenId() and getTokenName() moved to Utils in checkstyle 6.7. DefaultLogger now trows UnsupportedEncodingExpection in 6.7. --- sevntu-checks/pom.xml | 2 +- .../src/main/java/com/github/sevntu/checkstyle/Utils.java | 2 +- .../checkstyle/checks/annotation/ForbidAnnotationCheck.java | 3 ++- .../coding/AvoidConstantAsFirstOperandInConditionCheck.java | 5 +++-- .../checks/coding/MultipleStringLiteralsExtendedCheck.java | 3 ++- .../checkstyle/checks/design/ChildBlockLengthCheck.java | 3 ++- .../com/github/sevntu/checkstyle/BaseCheckTestSupport.java | 3 ++- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/sevntu-checks/pom.xml b/sevntu-checks/pom.xml index 445757b5ef..ea2f237010 100644 --- a/sevntu-checks/pom.xml +++ b/sevntu-checks/pom.xml @@ -16,7 +16,7 @@ com.puppycrawl.tools checkstyle - 6.5 + 6.7 diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/Utils.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/Utils.java index e7ac886fb3..eab471925a 100644 --- a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/Utils.java +++ b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/Utils.java @@ -41,7 +41,7 @@ private Utils() public static void reportInvalidToken(int token) { throw new IllegalArgumentException("Found unsupported token: " - + TokenTypes.getTokenName(token)); + + com.puppycrawl.tools.checkstyle.Utils.getTokenName(token)); } /** 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 index a495c98f01..94936863dc 100644 --- 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 @@ -22,6 +22,7 @@ import java.util.HashSet; import java.util.Set; +import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; @@ -76,7 +77,7 @@ public void setAnnotationTargets(String[] targets) if (targets != null) { annotationTargets = new int[targets.length]; for (int i = 0; i < targets.length; i++) { - annotationTargets[i] = TokenTypes.getTokenId(targets[i]); + annotationTargets[i] = Utils.getTokenId(targets[i]); } 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 index 6573ba464e..043325a057 100755 --- 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 @@ -18,6 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package com.github.sevntu.checkstyle.checks.coding; +import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; @@ -70,7 +71,7 @@ public void setTargetConstantTypes(String[] targets) { if (targets != null) { targetConstantTypes = new int[targets.length]; for (int i = 0; i < targets.length; i++) { - targetConstantTypes[i] = TokenTypes.getTokenId(targets[i]); + targetConstantTypes[i] = Utils.getTokenId(targets[i]); } Arrays.sort(targetConstantTypes); } @@ -134,4 +135,4 @@ private static DetailAST[] getBothChildren(DetailAST logicNode) { private boolean isTargetConstantType(int targetType) { return Arrays.binarySearch(targetConstantTypes, targetType) > -1; } -} \ No newline at end of file +} diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/MultipleStringLiteralsExtendedCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/MultipleStringLiteralsExtendedCheck.java index 9e161ba3ba..a772995ae5 100755 --- a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/MultipleStringLiteralsExtendedCheck.java +++ b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/MultipleStringLiteralsExtendedCheck.java @@ -26,6 +26,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; @@ -124,7 +125,7 @@ public final void setIgnoreOccurrenceContext(String[] strRep) { ignoreOccurrenceContext.clear(); for (final String s : strRep) { - final int type = TokenTypes.getTokenId(s); + final int type = Utils.getTokenId(s); ignoreOccurrenceContext.set(type); } } 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 index 63d89c4434..cdb3255d17 100644 --- 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 @@ -22,6 +22,7 @@ import java.util.List; import com.google.common.collect.Lists; +import com.puppycrawl.tools.checkstyle.Utils; import com.puppycrawl.tools.checkstyle.api.Check; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; @@ -102,7 +103,7 @@ public void setBlockTypes(final String[] blockTypes) { this.blockTypes = new int[blockTypes.length]; for (int i = 0; i < blockTypes.length; i++) { - this.blockTypes[i] = TokenTypes.getTokenId(blockTypes[i]); + this.blockTypes[i] = Utils.getTokenId(blockTypes[i]); } } diff --git a/sevntu-checks/src/test/java/com/github/sevntu/checkstyle/BaseCheckTestSupport.java b/sevntu-checks/src/test/java/com/github/sevntu/checkstyle/BaseCheckTestSupport.java index e15532bf23..ee8ffbcaf0 100644 --- a/sevntu-checks/src/test/java/com/github/sevntu/checkstyle/BaseCheckTestSupport.java +++ b/sevntu-checks/src/test/java/com/github/sevntu/checkstyle/BaseCheckTestSupport.java @@ -10,6 +10,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.PrintStream; +import java.io.UnsupportedEncodingException; import java.net.URL; import java.util.List; import java.util.Locale; @@ -31,7 +32,7 @@ public abstract class BaseCheckTestSupport extends Assert protected static class BriefLogger extends DefaultLogger { - public BriefLogger(OutputStream out) + public BriefLogger(OutputStream out) throws UnsupportedEncodingException { super(out, true); }