Address https://errorprone.info/bugpattern/UnnecessaryDefaultInEnumSw…

…itch warnings. RELNOTES=n/a PiperOrigin-RevId: 686551836
google · Oct 16, 2024 · 98d5528 · 98d5528
1 parent 10d4b1b
commit 98d5528
Show file tree

Hide file tree

Showing 26 changed files with 44 additions and 112 deletions.
diff --git a/...a-tests/benchmark/com/google/common/util/concurrent/AbstractFutureFootprintBenchmark.java b/...a-tests/benchmark/com/google/common/util/concurrent/AbstractFutureFootprintBenchmark.java
@@ -98,8 +98,6 @@ public void run() {
       case FAILED:
         f.setException(new Exception());
         break;
-      default:
-        throw new AssertionError();
     }
     return f;
   }

diff --git a/android/guava-tests/test/com/google/common/collect/SortedListsTest.java b/android/guava-tests/test/com/google/common/collect/SortedListsTest.java
@@ -73,8 +73,6 @@ void assertModelAgrees(
           return;
         }
         break;
-      default:
-        throw new AssertionError();
     }
     // key is not present
     int nextHigherIndex = list.size();
@@ -91,9 +89,8 @@ void assertModelAgrees(
       case INVERTED_INSERTION_INDEX:
         assertEquals(-1 - nextHigherIndex, answer);
         return;
-      default:
-        throw new AssertionError();
     }
+    throw new AssertionError();
   }
 
   public void testWithoutDups() {

diff --git a/android/guava-tests/test/com/google/common/graph/GraphEquivalenceTest.java b/android/guava-tests/test/com/google/common/graph/GraphEquivalenceTest.java
@@ -56,9 +56,8 @@ private static MutableGraph<Integer> createGraph(EdgeType edgeType) {
         return GraphBuilder.undirected().allowsSelfLoops(true).build();
       case DIRECTED:
         return GraphBuilder.directed().allowsSelfLoops(true).build();
-      default:
-        throw new IllegalStateException("Unexpected edge type: " + edgeType);
     }
+    throw new IllegalStateException("Unexpected edge type: " + edgeType);
   }
 
   private static EdgeType oppositeType(EdgeType edgeType) {
@@ -67,9 +66,8 @@ private static EdgeType oppositeType(EdgeType edgeType) {
         return EdgeType.DIRECTED;
       case DIRECTED:
         return EdgeType.UNDIRECTED;
-      default:
-        throw new IllegalStateException("Unexpected edge type: " + edgeType);
     }
+    throw new IllegalStateException("Unexpected edge type: " + edgeType);
   }
 
   @Test
@@ -150,8 +148,6 @@ public void equivalent_edgeDirectionsDiffer() {
       case DIRECTED:
         assertThat(graph).isNotEqualTo(g2);
         break;
-      default:
-        throw new IllegalStateException("Unexpected edge type: " + edgeType);
     }
   }
 }
diff --git a/android/guava-tests/test/com/google/common/graph/NetworkEquivalenceTest.java b/android/guava-tests/test/com/google/common/graph/NetworkEquivalenceTest.java
@@ -61,9 +61,8 @@ private static MutableNetwork<Integer, String> createNetwork(EdgeType edgeType)
         return NetworkBuilder.undirected().allowsSelfLoops(true).build();
       case DIRECTED:
         return NetworkBuilder.directed().allowsSelfLoops(true).build();
-      default:
-        throw new IllegalStateException("Unexpected edge type: " + edgeType);
     }
+    throw new IllegalStateException("Unexpected edge type: " + edgeType);
   }
 
   private static EdgeType oppositeType(EdgeType edgeType) {
@@ -72,9 +71,8 @@ private static EdgeType oppositeType(EdgeType edgeType) {
         return EdgeType.DIRECTED;
       case DIRECTED:
         return EdgeType.UNDIRECTED;
-      default:
-        throw new IllegalStateException("Unexpected edge type: " + edgeType);
     }
+    throw new IllegalStateException("Unexpected edge type: " + edgeType);
   }
 
   @Test
@@ -184,8 +182,6 @@ public void equivalent_edgeDirectionsDiffer() {
       case DIRECTED:
         assertThat(network).isNotEqualTo(g2);
         break;
-      default:
-        throw new IllegalStateException("Unexpected edge type: " + edgeType);
     }
   }
 }
diff --git a/android/guava-tests/test/com/google/common/util/concurrent/MoreExecutorsTest.java b/android/guava-tests/test/com/google/common/util/concurrent/MoreExecutorsTest.java
@@ -285,7 +285,6 @@ void awaitTimedWaiting(Thread thread) {
         case TIMED_WAITING:
           return;
         case TERMINATED:
-        default:
           throw new AssertionError();
       }
     }

diff --git a/android/guava/src/com/google/common/base/Stopwatch.java b/android/guava/src/com/google/common/base/Stopwatch.java
@@ -260,8 +260,7 @@ private static String abbreviate(TimeUnit unit) {
         return "h";
       case DAYS:
         return "d";
-      default:
-        throw new AssertionError();
     }
+    throw new AssertionError();
   }
 }
diff --git a/android/guava/src/com/google/common/collect/Cut.java b/android/guava/src/com/google/common/collect/Cut.java
@@ -339,9 +339,8 @@ Cut<C> withLowerBoundType(BoundType boundType, DiscreteDomain<C> domain) {
         case OPEN:
           C previous = domain.previous(endpoint);
           return (previous == null) ? Cut.<C>belowAll() : new AboveValue<C>(previous);
-        default:
-          throw new AssertionError();
       }
+      throw new AssertionError();
     }
 
     @Override
@@ -352,9 +351,8 @@ Cut<C> withUpperBoundType(BoundType boundType, DiscreteDomain<C> domain) {
           return (previous == null) ? Cut.<C>aboveAll() : new AboveValue<C>(previous);
         case OPEN:
           return this;
-        default:
-          throw new AssertionError();
       }
+      throw new AssertionError();
     }
 
     @Override
@@ -423,9 +421,8 @@ Cut<C> withLowerBoundType(BoundType boundType, DiscreteDomain<C> domain) {
         case CLOSED:
           C next = domain.next(endpoint);
           return (next == null) ? Cut.<C>belowAll() : belowValue(next);
-        default:
-          throw new AssertionError();
       }
+      throw new AssertionError();
     }
 
     @Override
@@ -436,9 +433,8 @@ Cut<C> withUpperBoundType(BoundType boundType, DiscreteDomain<C> domain) {
           return (next == null) ? Cut.<C>aboveAll() : belowValue(next);
         case CLOSED:
           return this;
-        default:
-          throw new AssertionError();
       }
+      throw new AssertionError();
     }
 
     @Override

diff --git a/android/guava/src/com/google/common/collect/Range.java b/android/guava/src/com/google/common/collect/Range.java
@@ -231,9 +231,8 @@ public static <C extends Comparable<?>> Range<C> upTo(C endpoint, BoundType boun
         return lessThan(endpoint);
       case CLOSED:
         return atMost(endpoint);
-      default:
-        throw new AssertionError();
     }
+    throw new AssertionError();
   }
 
   /**
@@ -266,9 +265,8 @@ public static <C extends Comparable<?>> Range<C> downTo(C endpoint, BoundType bo
         return greaterThan(endpoint);
       case CLOSED:
         return atLeast(endpoint);
-      default:
-        throw new AssertionError();
     }
+    throw new AssertionError();
   }
 
   private static final Range<Comparable> ALL = new Range<>(Cut.belowAll(), Cut.aboveAll());

diff --git a/android/guava/src/com/google/common/collect/TreeMultiset.java b/android/guava/src/com/google/common/collect/TreeMultiset.java
@@ -190,9 +190,8 @@ private long aggregateBelowRange(Aggregate aggr, @CheckForNull AvlNode<E> node)
           return aggr.nodeAggregate(node) + aggr.treeAggregate(node.left);
         case CLOSED:
           return aggr.treeAggregate(node.left);
-        default:
-          throw new AssertionError();
       }
+      throw new AssertionError();
     } else {
       return aggr.treeAggregate(node.left)
           + aggr.nodeAggregate(node)
@@ -216,9 +215,8 @@ private long aggregateAboveRange(Aggregate aggr, @CheckForNull AvlNode<E> node)
           return aggr.nodeAggregate(node) + aggr.treeAggregate(node.right);
         case CLOSED:
           return aggr.treeAggregate(node.right);
-        default:
-          throw new AssertionError();
       }
+      throw new AssertionError();
     } else {
       return aggr.treeAggregate(node.right)
           + aggr.nodeAggregate(node)

diff --git a/android/guava/src/com/google/common/graph/ElementOrder.java b/android/guava/src/com/google/common/graph/ElementOrder.java
@@ -197,9 +197,8 @@ <K extends T, V> Map<K, V> createMap(int expectedSize) {
         return Maps.newLinkedHashMapWithExpectedSize(expectedSize);
       case SORTED:
         return Maps.newTreeMap(comparator());
-      default:
-        throw new AssertionError();
     }
+    throw new AssertionError();
   }
 
   @SuppressWarnings("unchecked")

diff --git a/android/guava/src/com/google/common/math/BigIntegerMath.java b/android/guava/src/com/google/common/math/BigIntegerMath.java
@@ -117,10 +117,8 @@ public static int log2(BigInteger x, RoundingMode mode) {
         BigInteger x2 = x.pow(2);
         int logX2Floor = x2.bitLength() - 1;
         return (logX2Floor < 2 * logFloor + 1) ? logFloor : logFloor + 1;
-
-      default:
-        throw new AssertionError();
     }
+    throw new AssertionError();
   }
 
   /*
@@ -204,9 +202,8 @@ public static int log10(BigInteger x, RoundingMode mode) {
         BigInteger x2 = x.pow(2);
         BigInteger halfPowerSquared = floorPow.pow(2).multiply(BigInteger.TEN);
         return (x2.compareTo(halfPowerSquared) <= 0) ? floorLog : floorLog + 1;
-      default:
-        throw new AssertionError();
     }
+    throw new AssertionError();
   }
 
   private static final double LN_10 = Math.log(10);
@@ -250,9 +247,8 @@ public static BigInteger sqrt(BigInteger x, RoundingMode mode) {
          * halfSquare.
          */
         return (halfSquare.compareTo(x) >= 0) ? sqrtFloor : sqrtFloor.add(BigInteger.ONE);
-      default:
-        throw new AssertionError();
     }
+    throw new AssertionError();
   }
 
   @GwtIncompatible // TODO

diff --git a/android/guava/src/com/google/common/math/DoubleMath.java b/android/guava/src/com/google/common/math/DoubleMath.java
@@ -107,10 +107,8 @@ static double roundIntermediate(double x, RoundingMode mode) {
             return z;
           }
         }
-
-      default:
-        throw new AssertionError();
     }
+    throw new AssertionError();
   }
 
   /**

diff --git a/android/guava/src/com/google/common/math/IntMath.java b/android/guava/src/com/google/common/math/IntMath.java
@@ -136,10 +136,8 @@ public static int log2(int x, RoundingMode mode) {
         // floor(2^(logFloor + 0.5))
         int logFloor = (Integer.SIZE - 1) - leadingZeros;
         return logFloor + lessThanBranchFree(cmp, x);
-
-      default:
-        throw new AssertionError();
     }
+    throw new AssertionError();
   }
 
   /** The biggest half power of two that can fit in an unsigned int. */
@@ -173,9 +171,8 @@ public static int log10(int x, RoundingMode mode) {
       case HALF_EVEN:
         // sqrt(10) is irrational, so log10(x) - logFloor is never exactly 0.5
         return logFloor + lessThanBranchFree(halfPowersOf10[logFloor], x);
-      default:
-        throw new AssertionError();
     }
+    throw new AssertionError();
   }
 
   private static int log10Floor(int x) {
@@ -292,9 +289,8 @@ public static int sqrt(int x, RoundingMode mode) {
          * signed int, so lessThanBranchFree is safe for use.
          */
         return sqrtFloor + lessThanBranchFree(halfSquare, x);
-      default:
-        throw new AssertionError();
     }
+    throw new AssertionError();
   }
 
   private static int sqrtFloor(int x) {

diff --git a/...a-tests/benchmark/com/google/common/util/concurrent/AbstractFutureFootprintBenchmark.java b/...a-tests/benchmark/com/google/common/util/concurrent/AbstractFutureFootprintBenchmark.java
@@ -98,8 +98,6 @@ public void run() {
       case FAILED:
         f.setException(new Exception());
         break;
-      default:
-        throw new AssertionError();
     }
     return f;
   }

diff --git a/guava-tests/test/com/google/common/collect/SortedListsTest.java b/guava-tests/test/com/google/common/collect/SortedListsTest.java
@@ -73,8 +73,6 @@ void assertModelAgrees(
           return;
         }
         break;
-      default:
-        throw new AssertionError();
     }
     // key is not present
     int nextHigherIndex = list.size();
@@ -91,9 +89,8 @@ void assertModelAgrees(
       case INVERTED_INSERTION_INDEX:
         assertEquals(-1 - nextHigherIndex, answer);
         return;
-      default:
-        throw new AssertionError();
     }
+    throw new AssertionError();
   }
 
   public void testWithoutDups() {

diff --git a/guava-tests/test/com/google/common/graph/GraphEquivalenceTest.java b/guava-tests/test/com/google/common/graph/GraphEquivalenceTest.java
@@ -56,9 +56,8 @@ private static MutableGraph<Integer> createGraph(EdgeType edgeType) {
         return GraphBuilder.undirected().allowsSelfLoops(true).build();
       case DIRECTED:
         return GraphBuilder.directed().allowsSelfLoops(true).build();
-      default:
-        throw new IllegalStateException("Unexpected edge type: " + edgeType);
     }
+    throw new IllegalStateException("Unexpected edge type: " + edgeType);
   }
 
   private static EdgeType oppositeType(EdgeType edgeType) {
@@ -67,9 +66,8 @@ private static EdgeType oppositeType(EdgeType edgeType) {
         return EdgeType.DIRECTED;
       case DIRECTED:
         return EdgeType.UNDIRECTED;
-      default:
-        throw new IllegalStateException("Unexpected edge type: " + edgeType);
     }
+    throw new IllegalStateException("Unexpected edge type: " + edgeType);
   }
 
   @Test
@@ -150,8 +148,6 @@ public void equivalent_edgeDirectionsDiffer() {
       case DIRECTED:
         assertThat(graph).isNotEqualTo(g2);
         break;
-      default:
-        throw new IllegalStateException("Unexpected edge type: " + edgeType);
     }
   }
 }
diff --git a/guava-tests/test/com/google/common/graph/NetworkEquivalenceTest.java b/guava-tests/test/com/google/common/graph/NetworkEquivalenceTest.java
@@ -61,9 +61,8 @@ private static MutableNetwork<Integer, String> createNetwork(EdgeType edgeType)
         return NetworkBuilder.undirected().allowsSelfLoops(true).build();
       case DIRECTED:
         return NetworkBuilder.directed().allowsSelfLoops(true).build();
-      default:
-        throw new IllegalStateException("Unexpected edge type: " + edgeType);
     }
+    throw new IllegalStateException("Unexpected edge type: " + edgeType);
   }
 
   private static EdgeType oppositeType(EdgeType edgeType) {
@@ -72,9 +71,8 @@ private static EdgeType oppositeType(EdgeType edgeType) {
         return EdgeType.DIRECTED;
       case DIRECTED:
         return EdgeType.UNDIRECTED;
-      default:
-        throw new IllegalStateException("Unexpected edge type: " + edgeType);
     }
+    throw new IllegalStateException("Unexpected edge type: " + edgeType);
   }
 
   @Test
@@ -184,8 +182,6 @@ public void equivalent_edgeDirectionsDiffer() {
       case DIRECTED:
         assertThat(network).isNotEqualTo(g2);
         break;
-      default:
-        throw new IllegalStateException("Unexpected edge type: " + edgeType);
     }
   }
 }
diff --git a/guava-tests/test/com/google/common/util/concurrent/MoreExecutorsTest.java b/guava-tests/test/com/google/common/util/concurrent/MoreExecutorsTest.java
@@ -285,7 +285,6 @@ void awaitTimedWaiting(Thread thread) {
         case TIMED_WAITING:
           return;
         case TERMINATED:
-        default:
           throw new AssertionError();
       }
     }

diff --git a/guava/src/com/google/common/base/Stopwatch.java b/guava/src/com/google/common/base/Stopwatch.java
@@ -281,8 +281,7 @@ private static String abbreviate(TimeUnit unit) {
         return "h";
       case DAYS:
         return "d";
-      default:
-        throw new AssertionError();
     }
+    throw new AssertionError();
   }
 }