Skip to content

Commit 98d5528

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
RELNOTES=n/a PiperOrigin-RevId: 686551836
1 parent 10d4b1b commit 98d5528

File tree

26 files changed

+44
-112
lines changed

26 files changed

+44
-112
lines changed

android/guava-tests/benchmark/com/google/common/util/concurrent/AbstractFutureFootprintBenchmark.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ public void run() {
9898
case FAILED:
9999
f.setException(new Exception());
100100
break;
101-
default:
102-
throw new AssertionError();
103101
}
104102
return f;
105103
}

android/guava-tests/test/com/google/common/collect/SortedListsTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ void assertModelAgrees(
7373
return;
7474
}
7575
break;
76-
default:
77-
throw new AssertionError();
7876
}
7977
// key is not present
8078
int nextHigherIndex = list.size();
@@ -91,9 +89,8 @@ void assertModelAgrees(
9189
case INVERTED_INSERTION_INDEX:
9290
assertEquals(-1 - nextHigherIndex, answer);
9391
return;
94-
default:
95-
throw new AssertionError();
9692
}
93+
throw new AssertionError();
9794
}
9895

9996
public void testWithoutDups() {

android/guava-tests/test/com/google/common/graph/GraphEquivalenceTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ private static MutableGraph<Integer> createGraph(EdgeType edgeType) {
5656
return GraphBuilder.undirected().allowsSelfLoops(true).build();
5757
case DIRECTED:
5858
return GraphBuilder.directed().allowsSelfLoops(true).build();
59-
default:
60-
throw new IllegalStateException("Unexpected edge type: " + edgeType);
6159
}
60+
throw new IllegalStateException("Unexpected edge type: " + edgeType);
6261
}
6362

6463
private static EdgeType oppositeType(EdgeType edgeType) {
@@ -67,9 +66,8 @@ private static EdgeType oppositeType(EdgeType edgeType) {
6766
return EdgeType.DIRECTED;
6867
case DIRECTED:
6968
return EdgeType.UNDIRECTED;
70-
default:
71-
throw new IllegalStateException("Unexpected edge type: " + edgeType);
7269
}
70+
throw new IllegalStateException("Unexpected edge type: " + edgeType);
7371
}
7472

7573
@Test
@@ -150,8 +148,6 @@ public void equivalent_edgeDirectionsDiffer() {
150148
case DIRECTED:
151149
assertThat(graph).isNotEqualTo(g2);
152150
break;
153-
default:
154-
throw new IllegalStateException("Unexpected edge type: " + edgeType);
155151
}
156152
}
157153
}

android/guava-tests/test/com/google/common/graph/NetworkEquivalenceTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,8 @@ private static MutableNetwork<Integer, String> createNetwork(EdgeType edgeType)
6161
return NetworkBuilder.undirected().allowsSelfLoops(true).build();
6262
case DIRECTED:
6363
return NetworkBuilder.directed().allowsSelfLoops(true).build();
64-
default:
65-
throw new IllegalStateException("Unexpected edge type: " + edgeType);
6664
}
65+
throw new IllegalStateException("Unexpected edge type: " + edgeType);
6766
}
6867

6968
private static EdgeType oppositeType(EdgeType edgeType) {
@@ -72,9 +71,8 @@ private static EdgeType oppositeType(EdgeType edgeType) {
7271
return EdgeType.DIRECTED;
7372
case DIRECTED:
7473
return EdgeType.UNDIRECTED;
75-
default:
76-
throw new IllegalStateException("Unexpected edge type: " + edgeType);
7774
}
75+
throw new IllegalStateException("Unexpected edge type: " + edgeType);
7876
}
7977

8078
@Test
@@ -184,8 +182,6 @@ public void equivalent_edgeDirectionsDiffer() {
184182
case DIRECTED:
185183
assertThat(network).isNotEqualTo(g2);
186184
break;
187-
default:
188-
throw new IllegalStateException("Unexpected edge type: " + edgeType);
189185
}
190186
}
191187
}

android/guava-tests/test/com/google/common/util/concurrent/MoreExecutorsTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ void awaitTimedWaiting(Thread thread) {
285285
case TIMED_WAITING:
286286
return;
287287
case TERMINATED:
288-
default:
289288
throw new AssertionError();
290289
}
291290
}

android/guava/src/com/google/common/base/Stopwatch.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,7 @@ private static String abbreviate(TimeUnit unit) {
260260
return "h";
261261
case DAYS:
262262
return "d";
263-
default:
264-
throw new AssertionError();
265263
}
264+
throw new AssertionError();
266265
}
267266
}

android/guava/src/com/google/common/collect/Cut.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,8 @@ Cut<C> withLowerBoundType(BoundType boundType, DiscreteDomain<C> domain) {
339339
case OPEN:
340340
C previous = domain.previous(endpoint);
341341
return (previous == null) ? Cut.<C>belowAll() : new AboveValue<C>(previous);
342-
default:
343-
throw new AssertionError();
344342
}
343+
throw new AssertionError();
345344
}
346345

347346
@Override
@@ -352,9 +351,8 @@ Cut<C> withUpperBoundType(BoundType boundType, DiscreteDomain<C> domain) {
352351
return (previous == null) ? Cut.<C>aboveAll() : new AboveValue<C>(previous);
353352
case OPEN:
354353
return this;
355-
default:
356-
throw new AssertionError();
357354
}
355+
throw new AssertionError();
358356
}
359357

360358
@Override
@@ -423,9 +421,8 @@ Cut<C> withLowerBoundType(BoundType boundType, DiscreteDomain<C> domain) {
423421
case CLOSED:
424422
C next = domain.next(endpoint);
425423
return (next == null) ? Cut.<C>belowAll() : belowValue(next);
426-
default:
427-
throw new AssertionError();
428424
}
425+
throw new AssertionError();
429426
}
430427

431428
@Override
@@ -436,9 +433,8 @@ Cut<C> withUpperBoundType(BoundType boundType, DiscreteDomain<C> domain) {
436433
return (next == null) ? Cut.<C>aboveAll() : belowValue(next);
437434
case CLOSED:
438435
return this;
439-
default:
440-
throw new AssertionError();
441436
}
437+
throw new AssertionError();
442438
}
443439

444440
@Override

android/guava/src/com/google/common/collect/Range.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,8 @@ public static <C extends Comparable<?>> Range<C> upTo(C endpoint, BoundType boun
231231
return lessThan(endpoint);
232232
case CLOSED:
233233
return atMost(endpoint);
234-
default:
235-
throw new AssertionError();
236234
}
235+
throw new AssertionError();
237236
}
238237

239238
/**
@@ -266,9 +265,8 @@ public static <C extends Comparable<?>> Range<C> downTo(C endpoint, BoundType bo
266265
return greaterThan(endpoint);
267266
case CLOSED:
268267
return atLeast(endpoint);
269-
default:
270-
throw new AssertionError();
271268
}
269+
throw new AssertionError();
272270
}
273271

274272
private static final Range<Comparable> ALL = new Range<>(Cut.belowAll(), Cut.aboveAll());

android/guava/src/com/google/common/collect/TreeMultiset.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,8 @@ private long aggregateBelowRange(Aggregate aggr, @CheckForNull AvlNode<E> node)
190190
return aggr.nodeAggregate(node) + aggr.treeAggregate(node.left);
191191
case CLOSED:
192192
return aggr.treeAggregate(node.left);
193-
default:
194-
throw new AssertionError();
195193
}
194+
throw new AssertionError();
196195
} else {
197196
return aggr.treeAggregate(node.left)
198197
+ aggr.nodeAggregate(node)
@@ -216,9 +215,8 @@ private long aggregateAboveRange(Aggregate aggr, @CheckForNull AvlNode<E> node)
216215
return aggr.nodeAggregate(node) + aggr.treeAggregate(node.right);
217216
case CLOSED:
218217
return aggr.treeAggregate(node.right);
219-
default:
220-
throw new AssertionError();
221218
}
219+
throw new AssertionError();
222220
} else {
223221
return aggr.treeAggregate(node.right)
224222
+ aggr.nodeAggregate(node)

android/guava/src/com/google/common/graph/ElementOrder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,8 @@ <K extends T, V> Map<K, V> createMap(int expectedSize) {
197197
return Maps.newLinkedHashMapWithExpectedSize(expectedSize);
198198
case SORTED:
199199
return Maps.newTreeMap(comparator());
200-
default:
201-
throw new AssertionError();
202200
}
201+
throw new AssertionError();
203202
}
204203

205204
@SuppressWarnings("unchecked")

0 commit comments

Comments
 (0)