Skip to content

Commit d7240c0

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
Use Reflection.newProxy and a lambda.
RELNOTES=n/a PiperOrigin-RevId: 811067979
1 parent a68d584 commit d7240c0

File tree

2 files changed

+10
-24
lines changed

2 files changed

+10
-24
lines changed

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

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import static com.google.common.collect.testing.google.MultisetElementSetTester.getElementSetDuplicateInitializingMethods;
3131
import static com.google.common.collect.testing.google.MultisetIteratorTester.getIteratorDuplicateInitializingMethods;
3232
import static com.google.common.collect.testing.google.MultisetRemoveTester.getRemoveDuplicateInitializingMethods;
33-
import static java.lang.reflect.Proxy.newProxyInstance;
33+
import static com.google.common.reflect.Reflection.newProxy;
3434

3535
import com.google.common.annotations.GwtIncompatible;
3636
import com.google.common.base.Ascii;
@@ -57,8 +57,6 @@
5757
import com.google.common.collect.testing.google.TestSetMultimapGenerator;
5858
import com.google.common.collect.testing.google.TestStringListMultimapGenerator;
5959
import com.google.common.collect.testing.google.TestStringMultisetGenerator;
60-
import java.lang.reflect.InvocationHandler;
61-
import java.lang.reflect.Method;
6260
import java.util.Collection;
6361
import java.util.HashMap;
6462
import java.util.List;
@@ -150,15 +148,10 @@ static <K, V> PopulatableMapAsMultimap<K, V> create() {
150148
this.map = new HashMap<>();
151149
this.unusableDelegate =
152150
(SetMultimap<K, V>)
153-
newProxyInstance(
154-
SetMultimap.class.getClassLoader(),
155-
new Class<?>[] {SetMultimap.class},
156-
new InvocationHandler() {
157-
@Override
158-
public Object invoke(Object proxy, Method method, Object[] args)
159-
throws Throwable {
160-
throw new UnsupportedOperationException();
161-
}
151+
newProxy(
152+
SetMultimap.class,
153+
(proxy, method, args) -> {
154+
throw new UnsupportedOperationException();
162155
});
163156
}
164157

guava-tests/test/com/google/common/collect/MultimapsCollectionTest.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import static com.google.common.collect.testing.google.MultisetForEachEntryTester.getForEachEntryDuplicateInitializingMethods;
3232
import static com.google.common.collect.testing.google.MultisetIteratorTester.getIteratorDuplicateInitializingMethods;
3333
import static com.google.common.collect.testing.google.MultisetRemoveTester.getRemoveDuplicateInitializingMethods;
34-
import static java.lang.reflect.Proxy.newProxyInstance;
34+
import static com.google.common.reflect.Reflection.newProxy;
3535

3636
import com.google.common.annotations.GwtIncompatible;
3737
import com.google.common.base.Ascii;
@@ -58,8 +58,6 @@
5858
import com.google.common.collect.testing.google.TestSetMultimapGenerator;
5959
import com.google.common.collect.testing.google.TestStringListMultimapGenerator;
6060
import com.google.common.collect.testing.google.TestStringMultisetGenerator;
61-
import java.lang.reflect.InvocationHandler;
62-
import java.lang.reflect.Method;
6361
import java.util.Collection;
6462
import java.util.HashMap;
6563
import java.util.List;
@@ -151,15 +149,10 @@ static <K, V> PopulatableMapAsMultimap<K, V> create() {
151149
this.map = new HashMap<>();
152150
this.unusableDelegate =
153151
(SetMultimap<K, V>)
154-
newProxyInstance(
155-
SetMultimap.class.getClassLoader(),
156-
new Class<?>[] {SetMultimap.class},
157-
new InvocationHandler() {
158-
@Override
159-
public Object invoke(Object proxy, Method method, Object[] args)
160-
throws Throwable {
161-
throw new UnsupportedOperationException();
162-
}
152+
newProxy(
153+
SetMultimap.class,
154+
(proxy, method, args) -> {
155+
throw new UnsupportedOperationException();
163156
});
164157
}
165158

0 commit comments

Comments
 (0)