Variable created by ConstantPatternCompile should be private.

Also fix the spacing issue. Suggestions from #1655 flume hits : http://unknown commit RELNOTES : Variable created by ConstantPatternCompile should be private. Also fix the spacing issue. PiperOrigin-RevId: 322705160
google · Jul 23, 2020 · 9e840a0 · 9e840a0
1 parent f849a90
commit 9e840a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ConstantPatternCompile.java b/core/src/main/java/com/google/errorprone/bugpatterns/ConstantPatternCompile.java
@@ -107,8 +107,8 @@ public Description matchVariable(VariableTree tree, VisitorState state) {
             .replace(pos, pos + varName.length(), upperUnderscoreVarName)
             .toString();
 
-    String modifiers = canUseStatic ? "static final " : "final ";
-    String variableTreeString = modifiers + variableReplacedString;
+    String modifiers = "private " + (canUseStatic ? "static " : "") + "final ";
+    String variableTreeString = modifiers + variableReplacedString + "\n";
     SuggestedFix fix =
         SuggestedFix.builder()
             .merge(renameVariableOccurrences(tree, upperUnderscoreVarName, state))

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ConstantPatternCompileTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ConstantPatternCompileTest.java
@@ -80,7 +80,7 @@ public void testFixGenerationStatic() {
             "import java.util.regex.Pattern;",
             "class Test {",
             "  private static final String MY_COOL_PATTERN = \"a+\";",
-            "  static final Pattern ATTERN = Pattern.compile(MY_COOL_PATTERN);",
+            "  private static final Pattern ATTERN = Pattern.compile(MY_COOL_PATTERN);",
             "  public static void myPopularStaticMethod() {",
             "    Matcher m = ATTERN.matcher(\"aaaaab\");",
             "  }",
@@ -111,7 +111,7 @@ public void testFixGeneration_nonStaticInnerClass() {
             "class Test {",
             "  private static final String MY_COOL_PATTERN = \"a+\";",
             "  class Inner {",
-            "  final Pattern ATTERN = Pattern.compile(MY_COOL_PATTERN);",
+            "  private final Pattern ATTERN = Pattern.compile(MY_COOL_PATTERN);",
             "  public void myPopularStaticMethod() {",
             "      Matcher m = ATTERN.matcher(\"aaaaab\");",
             "    }",