diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java index d95802df4..569ea35ea 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java @@ -313,6 +313,9 @@ public class CustomImportOrderCheck extends Check { /** NON_GROUP group name. */ private static final String NON_GROUP_RULE_GROUP = "NOT_ASSIGNED_TO_ANY_GROUP"; + /** Pattern used to separate groups of imports */ + private static final Pattern GROUP_SEPARATOR_PATTERN = Pattern.compile("\\s*###\\s*"); + /** RegExp for SAME_PACKAGE group imports */ private String samePackageDomainsRegExp = ""; @@ -399,8 +402,7 @@ public class CustomImportOrderCheck extends Check { */ public final void setCustomImportOrderRules(final String inputCustomImportOrder) { customImportOrderRules.clear(); - for (String currentState : inputCustomImportOrder - .split("\\s*###\\s*")) { + for (String currentState : GROUP_SEPARATOR_PATTERN.split(inputCustomImportOrder)) { addRuleastoList(currentState); } customImportOrderRules.add(NON_GROUP_RULE_GROUP); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java index a986513a6..6dfd8ecf1 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheck.java @@ -72,6 +72,11 @@ public class SummaryJavadocCheck extends AbstractJavadocCheck { * file. */ public static final String SUMMARY_JAVADOC = "summary.javaDoc"; + /** + * This regexp is used to convert multiline javdoc to single line without stars. + */ + private static final Pattern JAVADOC_MULTILINE_TO_SINGLELINE_PATTERN = + Pattern.compile("\n[ ]+(\\*)|^[ ]+(\\*)"); /** Period literal. */ private static final String PERIOD = "."; @@ -178,8 +183,8 @@ public class SummaryJavadocCheck extends AbstractJavadocCheck { * @return true, if first sentence contains forbidden summary fragment. */ private boolean containsForbiddenFragment(String firstSentence) { - // This regexp is used to convert multiline javdoc to single line without stars. - String javadocText = firstSentence.replaceAll("\n[ ]+(\\*)|^[ ]+(\\*)", " "); + String javadocText = JAVADOC_MULTILINE_TO_SINGLELINE_PATTERN + .matcher(firstSentence).replaceAll(" "); javadocText = CharMatcher.WHITESPACE.trimAndCollapseFrom(javadocText, ' '); return forbiddenSummaryFragments.matcher(javadocText).find(); }