Skip to content

Commit ac424d0

Browse files
graememorganError Prone Team
authored and
Error Prone Team
committed
Tighten the return types in Fix.
Remove the `default`ness of a method, given there's only one subclass. PiperOrigin-RevId: 566989946
1 parent 58e5bb8 commit ac424d0

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

check_api/src/main/java/com/google/errorprone/fixes/Fix.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616

1717
package com.google.errorprone.fixes;
1818

19+
import com.google.common.collect.ImmutableSet;
1920
import com.sun.tools.javac.tree.EndPosTable;
2021
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
21-
import java.util.Collection;
22-
import java.util.Set;
2322

2423
/**
2524
* Represents a source code transformation, usually used to fix a bug detected by error-prone.
@@ -36,17 +35,15 @@ public interface Fix {
3635
*
3736
* <p>Empty string generates the default description.
3837
*/
39-
default String getShortDescription() {
40-
return "";
41-
}
38+
String getShortDescription();
4239

4340
Replacements.CoalescePolicy getCoalescePolicy();
4441

45-
Set<Replacement> getReplacements(EndPosTable endPositions);
42+
ImmutableSet<Replacement> getReplacements(EndPosTable endPositions);
4643

47-
Collection<String> getImportsToAdd();
44+
ImmutableSet<String> getImportsToAdd();
4845

49-
Collection<String> getImportsToRemove();
46+
ImmutableSet<String> getImportsToRemove();
5047

5148
boolean isEmpty();
5249
}

check_api/src/main/java/com/google/errorprone/fixes/SuggestedFix.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public String toString(JCCompilationUnit compilationUnit) {
8585
public abstract int hashCode();
8686

8787
@Override
88-
public Set<Replacement> getReplacements(EndPosTable endPositions) {
88+
public ImmutableSet<Replacement> getReplacements(EndPosTable endPositions) {
8989
if (endPositions == null) {
9090
throw new IllegalArgumentException(
9191
"Cannot produce correct replacements without endPositions.");

check_api/src/test/java/com/google/errorprone/fixes/AppliedFixTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@
2424
import static org.mockito.Mockito.mock;
2525
import static org.mockito.Mockito.when;
2626

27+
import com.google.common.collect.ImmutableSet;
2728
import com.sun.source.tree.TreeVisitor;
2829
import com.sun.tools.javac.tree.EndPosTable;
2930
import com.sun.tools.javac.tree.JCTree;
3031
import com.sun.tools.javac.util.Position;
3132
import java.util.HashMap;
32-
import java.util.LinkedHashSet;
3333
import java.util.Map;
34-
import java.util.Set;
3534
import org.junit.Test;
3635
import org.junit.runner.RunWith;
3736
import org.junit.runners.JUnit4;
@@ -156,9 +155,8 @@ public void shouldSuggestToRemoveLastLineIfAsked() {
156155
@Test
157156
public void shouldApplyFixesInReverseOrder() {
158157
// Have to use a mock Fix here in order to intentionally return Replacements in wrong order.
159-
Set<Replacement> replacements = new LinkedHashSet<>();
160-
replacements.add(Replacement.create(0, 1, ""));
161-
replacements.add(Replacement.create(1, 1, ""));
158+
ImmutableSet<Replacement> replacements =
159+
ImmutableSet.of(Replacement.create(0, 1, ""), Replacement.create(1, 1, ""));
162160

163161
Fix mockFix = mock(Fix.class);
164162
when(mockFix.getReplacements(any())).thenReturn(replacements);

0 commit comments

Comments
 (0)