Remove DiffNotApplicableException

cushon · Error Prone Team · commit 737dec07570a · 2023-09-21T09:09:08.000-07:00
Let any IndexOutOfBoundsExceptions propagate, and handle RuntimeException in DiffApplier. See discussion in #4086. PiperOrigin-RevId: 567323714
diff --git a/check_api/src/main/java/com/google/errorprone/apply/DescriptionBasedDiff.java b/check_api/src/main/java/com/google/errorprone/apply/DescriptionBasedDiff.java
@@ -109,7 +109,7 @@ public void handleFix(Fix fix) {
   }
 
   @Override
-  public void applyDifferences(SourceFile sourceFile) throws DiffNotApplicableException {
+  public void applyDifferences(SourceFile sourceFile) {
     if (!importsToAdd.isEmpty() || !importsToRemove.isEmpty()) {
       ImportStatements importStatements = ImportStatements.create(compilationUnit, importOrganizer);
       importStatements.addAll(importsToAdd);
diff --git a/check_api/src/main/java/com/google/errorprone/apply/Diff.java b/check_api/src/main/java/com/google/errorprone/apply/Diff.java
@@ -25,10 +25,6 @@ public interface Diff {
   /** Gets the name of the file this difference applies to */
   String getRelevantFileName();
 
-  /**
-   * Applies this difference to the supplied {@code sourceFile}.
-   *
-   * @throws DiffNotApplicableException if the diff could not be applied to the source file
-   */
+  /** Applies this difference to the supplied {@code sourceFile}. */
   void applyDifferences(SourceFile sourceFile);
 }
diff --git a/check_api/src/main/java/com/google/errorprone/apply/DiffApplier.java b/check_api/src/main/java/com/google/errorprone/apply/DiffApplier.java
@@ -123,7 +123,7 @@ public void run() {
         if (completed % 100 == 0) {
           logger.log(Level.INFO, String.format("Completed %d files in %s", completed, stopwatch));
         }
-      } catch (IOException | DiffNotApplicableException e) {
+      } catch (IOException | RuntimeException e) {
         logger.log(Level.WARNING, "Failed to apply diff to file " + diff.getRelevantFileName(), e);
         diffsFailedPaths.add(diff.getRelevantFileName());
       } finally {
diff --git a/check_api/src/main/java/com/google/errorprone/apply/DiffNotApplicableException.java b/check_api/src/main/java/com/google/errorprone/apply/DiffNotApplicableException.java

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public void handleFix(Fix fix) {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`@Override`
`112`		`- public void applyDifferences(SourceFile sourceFile) throws DiffNotApplicableException {`
	`112`	`+ public void applyDifferences(SourceFile sourceFile) {`
`113`	`113`	`if (!importsToAdd.isEmpty() \|\| !importsToRemove.isEmpty()) {`
`114`	`114`	`ImportStatements importStatements = ImportStatements.create(compilationUnit, importOrganizer);`
`115`	`115`	`importStatements.addAll(importsToAdd);`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public void run() {`
`123`	`123`	`if (completed % 100 == 0) {`
`124`	`124`	`logger.log(Level.INFO, String.format("Completed %d files in %s", completed, stopwatch));`
`125`	`125`	`}`
`126`		`- } catch (IOException \| DiffNotApplicableException e) {`
	`126`	`+ } catch (IOException \| RuntimeException e) {`
`127`	`127`	`logger.log(Level.WARNING, "Failed to apply diff to file " + diff.getRelevantFileName(), e);`
`128`	`128`	`diffsFailedPaths.add(diff.getRelevantFileName());`
`129`	`129`	`} finally {`