Skip to content

Commit 8843b6c

Browse files
cushonronshapiro
cushon
authored and
ronshapiro
committed
Add missing @OverRide annotations
RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=232004516
1 parent 7809097 commit 8843b6c

39 files changed

+140
-4
lines changed

‎android/guava-testlib/src/com/google/common/collect/testing/google/AbstractListMultimapTester.java

+2
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@
3232
public class AbstractListMultimapTester<K, V>
3333
extends AbstractMultimapTester<K, V, ListMultimap<K, V>> {
3434

35+
@Override
3536
protected void assertGet(K key, V... values) {
3637
assertGet(key, Arrays.asList(values));
3738
}
3839

40+
@Override
3941
protected void assertGet(K key, Collection<V> values) {
4042
assertEqualInOrder(values, multimap().get(key));
4143

‎android/guava-testlib/src/com/google/common/collect/testing/google/DerivedGoogleCollectionGenerators.java

+3
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public V[] createValueArray(int length) {
8181
return (V[]) new Object[length];
8282
}
8383

84+
@Override
8485
public TestSubjectGenerator<?> getInnerGenerator() {
8586
return generator;
8687
}
@@ -144,6 +145,7 @@ public K[] createValueArray(int length) {
144145
return (K[]) new Object[length];
145146
}
146147

148+
@Override
147149
public TestSubjectGenerator<?> getInnerGenerator() {
148150
return generator;
149151
}
@@ -202,6 +204,7 @@ public Iterable<V> order(List<V> insertionOrder) {
202204
return insertionOrder;
203205
}
204206

207+
@Override
205208
public TestSubjectGenerator<?> getInnerGenerator() {
206209
return mapGenerator;
207210
}

‎android/guava-testlib/src/com/google/common/testing/GcFinalization.java

+1
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ public interface FinalizationPredicate {
264264
public static void awaitClear(final WeakReference<?> ref) {
265265
awaitDone(
266266
new FinalizationPredicate() {
267+
@Override
267268
public boolean isDone() {
268269
return ref.get() == null;
269270
}

‎android/guava/src/com/google/common/cache/LongAdder.java

+9
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ final class LongAdder extends Striped64 implements Serializable, LongAddable {
4444
private static final long serialVersionUID = 7249069246863182397L;
4545

4646
/** Version of plus for use in retryUpdate */
47+
@Override
4748
final long fn(long v, long x) {
4849
return v + x;
4950
}
@@ -56,6 +57,7 @@ public LongAdder() {}
5657
*
5758
* @param x the value to add
5859
*/
60+
@Override
5961
public void add(long x) {
6062
Cell[] as;
6163
long b, v;
@@ -73,6 +75,7 @@ public void add(long x) {
7375
}
7476

7577
/** Equivalent to {@code add(1)}. */
78+
@Override
7679
public void increment() {
7780
add(1L);
7881
}
@@ -89,6 +92,7 @@ public void decrement() {
8992
*
9093
* @return the sum
9194
*/
95+
@Override
9296
public long sum() {
9397
long sum = base;
9498
Cell[] as = cells;
@@ -142,6 +146,7 @@ public long sumThenReset() {
142146
*
143147
* @return the String representation of the {@link #sum}
144148
*/
149+
@Override
145150
public String toString() {
146151
return Long.toString(sum());
147152
}
@@ -151,21 +156,25 @@ public String toString() {
151156
*
152157
* @return the sum
153158
*/
159+
@Override
154160
public long longValue() {
155161
return sum();
156162
}
157163

158164
/** Returns the {@link #sum} as an {@code int} after a narrowing primitive conversion. */
165+
@Override
159166
public int intValue() {
160167
return (int) sum();
161168
}
162169

163170
/** Returns the {@link #sum} as a {@code float} after a widening primitive conversion. */
171+
@Override
164172
public float floatValue() {
165173
return (float) sum();
166174
}
167175

168176
/** Returns the {@link #sum} as a {@code double} after a widening primitive conversion. */
177+
@Override
169178
public double doubleValue() {
170179
return (double) sum();
171180
}

‎android/guava/src/com/google/common/cache/Striped64.java

+1
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ private static sun.misc.Unsafe getUnsafe() {
293293
try {
294294
return java.security.AccessController.doPrivileged(
295295
new java.security.PrivilegedExceptionAction<sun.misc.Unsafe>() {
296+
@Override
296297
public sun.misc.Unsafe run() throws Exception {
297298
Class<sun.misc.Unsafe> k = sun.misc.Unsafe.class;
298299
for (java.lang.reflect.Field f : k.getDeclaredFields()) {

‎android/guava/src/com/google/common/collect/EmptyContiguousSet.java

+1
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ Object writeReplace() {
162162
}
163163

164164
@GwtIncompatible // NavigableSet
165+
@Override
165166
ImmutableSortedSet<C> createDescendingSet() {
166167
return ImmutableSortedSet.emptySet(Ordering.natural().reverse());
167168
}

‎android/guava/src/com/google/common/collect/ImmutableSetMultimap.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,8 @@ public ImmutableSet<V> get(@NullableDecl K key) {
366366
* <p>Because an inverse of a set multimap cannot contain multiple pairs with the same key and
367367
* value, this method returns an {@code ImmutableSetMultimap} rather than the {@code
368368
* ImmutableMultimap} specified in the {@code ImmutableMultimap} class.
369-
*
370-
* @since 11.0
371369
*/
370+
@Override
372371
public ImmutableSetMultimap<V, K> inverse() {
373372
ImmutableSetMultimap<V, K> result = inverse;
374373
return (result == null) ? (inverse = invert()) : result;

‎android/guava/src/com/google/common/collect/SortedMultiset.java

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public interface SortedMultiset<E> extends SortedMultisetBridge<E>, SortedIterab
4747
* Returns the comparator that orders this multiset, or {@link Ordering#natural()} if the natural
4848
* ordering of the elements is used.
4949
*/
50+
@Override
5051
Comparator<? super E> comparator();
5152

5253
/**

‎android/guava/src/com/google/common/hash/Funnels.java

+6
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public static Funnel<byte[]> byteArrayFunnel() {
3939
private enum ByteArrayFunnel implements Funnel<byte[]> {
4040
INSTANCE;
4141

42+
@Override
4243
public void funnel(byte[] from, PrimitiveSink into) {
4344
into.putBytes(from);
4445
}
@@ -63,6 +64,7 @@ public static Funnel<CharSequence> unencodedCharsFunnel() {
6364
private enum UnencodedCharsFunnel implements Funnel<CharSequence> {
6465
INSTANCE;
6566

67+
@Override
6668
public void funnel(CharSequence from, PrimitiveSink into) {
6769
into.putUnencodedChars(from);
6870
}
@@ -90,6 +92,7 @@ private static class StringCharsetFunnel implements Funnel<CharSequence>, Serial
9092
this.charset = Preconditions.checkNotNull(charset);
9193
}
9294

95+
@Override
9396
public void funnel(CharSequence from, PrimitiveSink into) {
9497
into.putString(from, charset);
9598
}
@@ -144,6 +147,7 @@ public static Funnel<Integer> integerFunnel() {
144147
private enum IntegerFunnel implements Funnel<Integer> {
145148
INSTANCE;
146149

150+
@Override
147151
public void funnel(Integer from, PrimitiveSink into) {
148152
into.putInt(from);
149153
}
@@ -171,6 +175,7 @@ private static class SequentialFunnel<E> implements Funnel<Iterable<? extends E>
171175
this.elementFunnel = Preconditions.checkNotNull(elementFunnel);
172176
}
173177

178+
@Override
174179
public void funnel(Iterable<? extends E> from, PrimitiveSink into) {
175180
for (E e : from) {
176181
elementFunnel.funnel(e, into);
@@ -209,6 +214,7 @@ public static Funnel<Long> longFunnel() {
209214
private enum LongFunnel implements Funnel<Long> {
210215
INSTANCE;
211216

217+
@Override
212218
public void funnel(Long from, PrimitiveSink into) {
213219
into.putLong(from);
214220
}

‎android/guava/src/com/google/common/hash/LongAdder.java

+9
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ final class LongAdder extends Striped64 implements Serializable, LongAddable {
4242
private static final long serialVersionUID = 7249069246863182397L;
4343

4444
/** Version of plus for use in retryUpdate */
45+
@Override
4546
final long fn(long v, long x) {
4647
return v + x;
4748
}
@@ -54,6 +55,7 @@ public LongAdder() {}
5455
*
5556
* @param x the value to add
5657
*/
58+
@Override
5759
public void add(long x) {
5860
Cell[] as;
5961
long b, v;
@@ -71,6 +73,7 @@ public void add(long x) {
7173
}
7274

7375
/** Equivalent to {@code add(1)}. */
76+
@Override
7477
public void increment() {
7578
add(1L);
7679
}
@@ -87,6 +90,7 @@ public void decrement() {
8790
*
8891
* @return the sum
8992
*/
93+
@Override
9094
public long sum() {
9195
long sum = base;
9296
Cell[] as = cells;
@@ -140,6 +144,7 @@ public long sumThenReset() {
140144
*
141145
* @return the String representation of the {@link #sum}
142146
*/
147+
@Override
143148
public String toString() {
144149
return Long.toString(sum());
145150
}
@@ -149,21 +154,25 @@ public String toString() {
149154
*
150155
* @return the sum
151156
*/
157+
@Override
152158
public long longValue() {
153159
return sum();
154160
}
155161

156162
/** Returns the {@link #sum} as an {@code int} after a narrowing primitive conversion. */
163+
@Override
157164
public int intValue() {
158165
return (int) sum();
159166
}
160167

161168
/** Returns the {@link #sum} as a {@code float} after a widening primitive conversion. */
169+
@Override
162170
public float floatValue() {
163171
return (float) sum();
164172
}
165173

166174
/** Returns the {@link #sum} as a {@code double} after a widening primitive conversion. */
175+
@Override
167176
public double doubleValue() {
168177
return (double) sum();
169178
}

‎android/guava/src/com/google/common/hash/Striped64.java

+1
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ private static sun.misc.Unsafe getUnsafe() {
293293
try {
294294
return java.security.AccessController.doPrivileged(
295295
new java.security.PrivilegedExceptionAction<sun.misc.Unsafe>() {
296+
@Override
296297
public sun.misc.Unsafe run() throws Exception {
297298
Class<sun.misc.Unsafe> k = sun.misc.Unsafe.class;
298299
for (java.lang.reflect.Field f : k.getDeclaredFields()) {

‎android/guava/src/com/google/common/util/concurrent/AtomicDouble.java

+5
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ public final double addAndGet(double delta) {
184184
*
185185
* @return the String representation of the current value
186186
*/
187+
@Override
187188
public String toString() {
188189
return Double.toString(get());
189190
}
@@ -192,6 +193,7 @@ public String toString() {
192193
* Returns the value of this {@code AtomicDouble} as an {@code int} after a narrowing primitive
193194
* conversion.
194195
*/
196+
@Override
195197
public int intValue() {
196198
return (int) get();
197199
}
@@ -200,6 +202,7 @@ public int intValue() {
200202
* Returns the value of this {@code AtomicDouble} as a {@code long} after a narrowing primitive
201203
* conversion.
202204
*/
205+
@Override
203206
public long longValue() {
204207
return (long) get();
205208
}
@@ -208,11 +211,13 @@ public long longValue() {
208211
* Returns the value of this {@code AtomicDouble} as a {@code float} after a narrowing primitive
209212
* conversion.
210213
*/
214+
@Override
211215
public float floatValue() {
212216
return (float) get();
213217
}
214218

215219
/** Returns the value of this {@code AtomicDouble} as a {@code double}. */
220+
@Override
216221
public double doubleValue() {
217222
return get();
218223
}

‎android/guava/src/com/google/common/util/concurrent/AtomicDoubleArray.java

+1
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ public double addAndGet(int i, double delta) {
206206
*
207207
* @return the String representation of the current values of array
208208
*/
209+
@Override
209210
public String toString() {
210211
int iMax = length() - 1;
211212
if (iMax == -1) {

‎android/guava/src/com/google/common/util/concurrent/ForwardingExecutorService.java

+1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ public void execute(Runnable command) {
9999
delegate().execute(command);
100100
}
101101

102+
@Override
102103
public <T> Future<T> submit(Callable<T> task) {
103104
return delegate().submit(task);
104105
}

‎guava-testlib/src/com/google/common/collect/testing/google/AbstractListMultimapTester.java

+2
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@
3232
public class AbstractListMultimapTester<K, V>
3333
extends AbstractMultimapTester<K, V, ListMultimap<K, V>> {
3434

35+
@Override
3536
protected void assertGet(K key, V... values) {
3637
assertGet(key, Arrays.asList(values));
3738
}
3839

40+
@Override
3941
protected void assertGet(K key, Collection<V> values) {
4042
assertEqualInOrder(values, multimap().get(key));
4143

‎guava-testlib/src/com/google/common/collect/testing/google/DerivedGoogleCollectionGenerators.java

+3
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public V[] createValueArray(int length) {
8181
return (V[]) new Object[length];
8282
}
8383

84+
@Override
8485
public TestSubjectGenerator<?> getInnerGenerator() {
8586
return generator;
8687
}
@@ -144,6 +145,7 @@ public K[] createValueArray(int length) {
144145
return (K[]) new Object[length];
145146
}
146147

148+
@Override
147149
public TestSubjectGenerator<?> getInnerGenerator() {
148150
return generator;
149151
}
@@ -202,6 +204,7 @@ public Iterable<V> order(List<V> insertionOrder) {
202204
return insertionOrder;
203205
}
204206

207+
@Override
205208
public TestSubjectGenerator<?> getInnerGenerator() {
206209
return mapGenerator;
207210
}

‎guava-testlib/src/com/google/common/testing/GcFinalization.java

+1
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ public interface FinalizationPredicate {
264264
public static void awaitClear(final WeakReference<?> ref) {
265265
awaitDone(
266266
new FinalizationPredicate() {
267+
@Override
267268
public boolean isDone() {
268269
return ref.get() == null;
269270
}

‎guava-testlib/test/com/google/common/testing/GcFinalizationTest.java

+3
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public void testAwaitDone_FinalizationPredicate() {
9494
map.put(new Object(), Boolean.TRUE);
9595
GcFinalization.awaitDone(
9696
new FinalizationPredicate() {
97+
@Override
9798
public boolean isDone() {
9899
return map.isEmpty();
99100
}
@@ -116,6 +117,7 @@ class Interruptenator extends Thread {
116117
Interruptenator(final Thread interruptee, final AtomicBoolean shutdown) {
117118
super(
118119
new Runnable() {
120+
@Override
119121
public void run() {
120122
while (!shutdown.get()) {
121123
interruptee.interrupt();
@@ -194,6 +196,7 @@ public void testAwaitDone_FinalizationPredicate_Interrupted() {
194196
try {
195197
GcFinalization.awaitDone(
196198
new FinalizationPredicate() {
199+
@Override
197200
public boolean isDone() {
198201
return false;
199202
}

‎guava-tests/test/com/google/common/base/FinalizableReferenceQueueTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public void testFinalizeReferentCalled() {
4545

4646
GcFinalization.awaitDone(
4747
new GcFinalization.FinalizationPredicate() {
48+
@Override
4849
public boolean isDone() {
4950
return reference.finalizeReferentCalled;
5051
}

0 commit comments

Comments
 (0)