diff --git a/config/suppressions.xml b/config/suppressions.xml index bf48f870a..f24d9dad7 100644 --- a/config/suppressions.xml +++ b/config/suppressions.xml @@ -43,7 +43,7 @@ + lines="146,252"/> requiredTranslations = Sets.newTreeSet(); + private Set requiredTranslations = Sets.newHashSet(); /** * Creates a new {@code TranslationCheck} instance. @@ -195,9 +194,8 @@ public class TranslationCheck extends AbstractFileSetCheck { * Sets language codes of required translations for the check. * @param translationCodes a comma separated list of language codes. */ - public void setRequiredTranslations(String translationCodes) { - requiredTranslations = Sets.newTreeSet(Splitter.on(',') - .trimResults().omitEmptyStrings().split(translationCodes)); + public void setRequiredTranslations(String... translationCodes) { + requiredTranslations = Sets.newHashSet(translationCodes); validateUserSpecifiedLanguageCodes(requiredTranslations); } @@ -205,7 +203,7 @@ public class TranslationCheck extends AbstractFileSetCheck { * Validates the correctness of user specififed language codes for the check. * @param languageCodes user specified language codes for the check. */ - private void validateUserSpecifiedLanguageCodes(SortedSet languageCodes) { + private void validateUserSpecifiedLanguageCodes(Set languageCodes) { for (String code : languageCodes) { if (!isValidLanguageCode(code)) { final LocalizedMessage msg = new LocalizedMessage(0, TRANSLATION_BUNDLE, diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java index 5cb5df75b..31b4aa2a4 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java @@ -20,7 +20,6 @@ package com.puppycrawl.tools.checkstyle.checks.coding; import java.util.Set; -import java.util.StringTokenizer; import antlr.collections.AST; @@ -73,9 +72,6 @@ public class IllegalInstantiationCheck /** {@link java.lang} package as string */ private static final String JAVA_LANG = "java.lang."; - /** Set of fully qualified class names. E.g. "java.lang.Boolean" */ - private final Set illegalClasses = Sets.newHashSet(); - /** The imports for the file. */ private final Set imports = Sets.newHashSet(); @@ -85,6 +81,9 @@ public class IllegalInstantiationCheck /** The instantiations in the file. */ private final Set instantiations = Sets.newHashSet(); + /** Set of fully qualified class names. E.g. "java.lang.Boolean" */ + private Set illegalClasses = Sets.newHashSet(); + /** Name of the package. */ private String pkgName; @@ -355,11 +354,7 @@ public class IllegalInstantiationCheck * Sets the classes that are illegal to instantiate. * @param names a comma separate list of class names */ - public void setClasses(String names) { - illegalClasses.clear(); - final StringTokenizer tok = new StringTokenizer(names, ","); - while (tok.hasMoreTokens()) { - illegalClasses.add(tok.nextToken()); - } + public void setClasses(String... names) { + illegalClasses = Sets.newHashSet(names); } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java index c92414d88..043186daf 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java @@ -20,6 +20,7 @@ package com.puppycrawl.tools.checkstyle.checks.javadoc; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -220,15 +221,8 @@ public class JavadocMethodCheck extends AbstractTypeAwareCheck { * Sets list of annotations. * @param userAnnotations user's value. */ - public void setAllowedAnnotations(String userAnnotations) { - final List annotations = new ArrayList<>(); - final String[] sAnnotations = userAnnotations.split(","); - for (int i = 0; i < sAnnotations.length; i++) { - sAnnotations[i] = sAnnotations[i].trim(); - } - - Collections.addAll(annotations, sAnnotations); - allowedAnnotations = annotations; + public void setAllowedAnnotations(String... userAnnotations) { + allowedAnnotations = Arrays.asList(userAnnotations); } /** diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java index 6de0db6c6..fd09865e2 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java @@ -19,12 +19,12 @@ package com.puppycrawl.tools.checkstyle.checks.naming; -import java.util.Arrays; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; +import com.google.common.collect.Sets; import com.puppycrawl.tools.checkstyle.api.AbstractCheck; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; @@ -156,10 +156,9 @@ public class AbbreviationAsWordInNameCheck extends AbstractCheck { * an string of abbreviations that must be skipped from checking, * each abbreviation separated by comma. */ - public void setAllowedAbbreviations(String allowedAbbreviations) { + public void setAllowedAbbreviations(String... allowedAbbreviations) { if (allowedAbbreviations != null) { - this.allowedAbbreviations = new HashSet<>( - Arrays.asList(allowedAbbreviations.split(","))); + this.allowedAbbreviations = Sets.newHashSet(allowedAbbreviations); } } diff --git a/src/xdocs/config_javadoc.xml b/src/xdocs/config_javadoc.xml index 69c5d68a3..0c4248119 100644 --- a/src/xdocs/config_javadoc.xml +++ b/src/xdocs/config_javadoc.xml @@ -220,7 +220,7 @@ public int checkReturnTag(final int aTagIndex, allowedAnnotations List of annotations that could allow missed documentation. - list of strings + String Set Override diff --git a/src/xdocs/config_naming.xml b/src/xdocs/config_naming.xml index 47517312b..fce538abe 100644 --- a/src/xdocs/config_naming.xml +++ b/src/xdocs/config_naming.xml @@ -61,7 +61,7 @@ allowedAbbreviations list of abbreviations that must be skipped for checking. Abbreviations should be separated by comma, no spaces are allowed. - stringSet + String Set null