Simplify SuggestedFix creation using the static factories.

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=303150947
google · Mar 30, 2020 · e9e27c3 · e9e27c3
1 parent 9ba1ce0
commit e9e27c3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/check_api/src/main/java/com/google/errorprone/fixes/SuggestedFixes.java b/check_api/src/main/java/com/google/errorprone/fixes/SuggestedFixes.java
@@ -630,7 +630,7 @@ public static SuggestedFix renameMethod(
     List<ErrorProneToken> methodTokens = state.getOffsetTokens(basePos, endPos);
     for (ErrorProneToken token : methodTokens) {
       if (token.kind() == TokenKind.IDENTIFIER && token.name().equals(tree.getName())) {
-        return SuggestedFix.builder().replace(token.pos(), token.endPos(), replacement).build();
+        return SuggestedFix.replace(token.pos(), token.endPos(), replacement);
       }
     }
     // Method name not found.

diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ProtoFieldNullComparison.java b/core/src/main/java/com/google/errorprone/bugpatterns/ProtoFieldNullComparison.java
@@ -501,13 +501,11 @@ SuggestedFix fix(Fixer fixer, ExpressionTree tree, VisitorState state) {
             .map(
                 r -> {
                   MethodInvocationTree receiver = (MethodInvocationTree) getReceiver(tree);
-                  return SuggestedFix.builder()
-                      .replace(
-                          tree,
-                          String.format(
-                              "%s(%s).isTrue()",
-                              state.getSourceForNode(receiver.getMethodSelect()), r))
-                      .build();
+                  return SuggestedFix.replace(
+                      tree,
+                      String.format(
+                          "%s(%s).isTrue()",
+                          state.getSourceForNode(receiver.getMethodSelect()), r));
                 })
             .orElse(SuggestedFix.builder().build());
       }

diff --git a/core/src/test/java/com/google/errorprone/refaster/DescriptionBasedDiffTest.java b/core/src/test/java/com/google/errorprone/refaster/DescriptionBasedDiffTest.java
@@ -145,20 +145,18 @@ public void overlappingDiffs_throws() {
                         .build())));
 
     DescriptionBasedDiff diff2 = createDescriptionBasedDiff();
-    diff2.onDescribed(dummyDescription(SuggestedFix.builder().replace(137, 140, "baz").build()));
+    diff2.onDescribed(dummyDescription(SuggestedFix.replace(137, 140, "baz")));
 
     assertThrows(
         IllegalArgumentException.class,
-        () ->
-            diff2.onDescribed(
-                dummyDescription(SuggestedFix.builder().replace(137, 140, "bar").build())));
+        () -> diff2.onDescribed(dummyDescription(SuggestedFix.replace(137, 140, "bar"))));
 
     DescriptionBasedDiff diff3 =
         DescriptionBasedDiff.createIgnoringOverlaps(
             compilationUnit, ImportOrganizer.STATIC_FIRST_ORGANIZER);
-    diff3.onDescribed(dummyDescription(SuggestedFix.builder().replace(137, 140, "baz").build()));
+    diff3.onDescribed(dummyDescription(SuggestedFix.replace(137, 140, "baz")));
     // No throw, since it's lenient. Refactors to the first "baz" replacement and ignores this.
-    diff3.onDescribed(dummyDescription(SuggestedFix.builder().replace(137, 140, "bar").build()));
+    diff3.onDescribed(dummyDescription(SuggestedFix.replace(137, 140, "bar")));
     diff3.applyDifferences(sourceFile);
 
     assertThat(sourceFile.getLines())