JRE reflection stripping: making method name more specific (isReflect…

…ionStripped to isJreReflectionStripped). Change on 2018/09/13 by antoniocortes <antoniocortes@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=212868324
michaelyousrie · Oct 9, 2018 · 5d5e56c · 5d5e56c
1 parent ca5073e
commit 5d5e56c
Show file tree

Hide file tree

Showing 37 changed files with 41 additions and 41 deletions.
diff --git a/jre_emul/Classes/com/google/j2objc/util/ReflectionUtil.java b/jre_emul/Classes/com/google/j2objc/util/ReflectionUtil.java
@@ -61,7 +61,7 @@ public static long getSerialVersionUID(Class<? extends Serializable> clazz) {
     }
   }
 
-  public static boolean isReflectionStripped() {
+  public static boolean isJreReflectionStripped() {
     // When reflection metadata is present, the name of the class is java.lang.Boolean.
     // For more details about this behavior see {@link #matchClassNamePrefix}.
     return Boolean.TRUE.getClass().getName().equals("JavaLangBoolean");

diff --git a/...latform/libcore/jsr166-tests/src/test/java/jsr166/AbstractQueuedLongSynchronizerTest.java b/...latform/libcore/jsr166-tests/src/test/java/jsr166/AbstractQueuedLongSynchronizerTest.java
@@ -1080,7 +1080,7 @@ public void testToString() {
      */
     public void testSerialization() {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         Mutex sync = new Mutex();

diff --git a/...id/platform/libcore/jsr166-tests/src/test/java/jsr166/AbstractQueuedSynchronizerTest.java b/...id/platform/libcore/jsr166-tests/src/test/java/jsr166/AbstractQueuedSynchronizerTest.java
@@ -1083,7 +1083,7 @@ public void testToString() {
      */
     public void testSerialization() {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         Mutex sync = new Mutex();

diff --git a/...ul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/ArrayBlockingQueueTest.java b/...ul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/ArrayBlockingQueueTest.java
@@ -844,7 +844,7 @@ public void realRun() throws InterruptedException {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         Queue x = populatedQueue(SIZE);

diff --git a/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/ArrayDequeTest.java b/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/ArrayDequeTest.java
@@ -891,7 +891,7 @@ public void testToString() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         Queue x = populatedDeque(SIZE);

diff --git a/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/AtomicBooleanTest.java b/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/AtomicBooleanTest.java
@@ -128,7 +128,7 @@ public void testGetAndSet() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         AtomicBoolean x = new AtomicBoolean();

diff --git a/...ul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/AtomicIntegerArrayTest.java b/...ul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/AtomicIntegerArrayTest.java
@@ -328,7 +328,7 @@ public void testCountingInMultipleThreads() throws InterruptedException {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         AtomicIntegerArray x = new AtomicIntegerArray(SIZE);

diff --git a/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/AtomicIntegerTest.java b/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/AtomicIntegerTest.java
@@ -202,7 +202,7 @@ public void testIncrementAndGet() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         AtomicInteger x = new AtomicInteger();

diff --git a/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/AtomicLongArrayTest.java b/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/AtomicLongArrayTest.java
@@ -327,7 +327,7 @@ public void testCountingInMultipleThreads() throws InterruptedException {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         AtomicLongArray x = new AtomicLongArray(SIZE);

diff --git a/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/AtomicLongTest.java b/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/AtomicLongTest.java
@@ -204,7 +204,7 @@ public void testIncrementAndGet() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         AtomicLong x = new AtomicLong();

diff --git a/.../android/platform/libcore/jsr166-tests/src/test/java/jsr166/AtomicReferenceArrayTest.java b/.../android/platform/libcore/jsr166-tests/src/test/java/jsr166/AtomicReferenceArrayTest.java
@@ -204,7 +204,7 @@ public void testGetAndSet() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         AtomicReferenceArray x = new AtomicReferenceArray(SIZE);

diff --git a/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/AtomicReferenceTest.java b/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/AtomicReferenceTest.java
@@ -127,7 +127,7 @@ public void testGetAndSet() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         AtomicReference x = new AtomicReference();

diff --git a/...mul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/ConcurrentHashMapTest.java b/...mul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/ConcurrentHashMapTest.java
@@ -781,7 +781,7 @@ public void testRemove3() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         Map x = map5();

diff --git a/...android/platform/libcore/jsr166-tests/src/test/java/jsr166/ConcurrentLinkedDequeTest.java b/...android/platform/libcore/jsr166-tests/src/test/java/jsr166/ConcurrentLinkedDequeTest.java
@@ -863,7 +863,7 @@ public void testToString() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         Queue x = populatedDeque(SIZE);

diff --git a/...android/platform/libcore/jsr166-tests/src/test/java/jsr166/ConcurrentLinkedQueueTest.java b/...android/platform/libcore/jsr166-tests/src/test/java/jsr166/ConcurrentLinkedQueueTest.java
@@ -513,7 +513,7 @@ public void testToString() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         Queue x = populatedQueue(SIZE);

diff --git a/...android/platform/libcore/jsr166-tests/src/test/java/jsr166/ConcurrentSkipListMapTest.java b/...android/platform/libcore/jsr166-tests/src/test/java/jsr166/ConcurrentSkipListMapTest.java
@@ -812,7 +812,7 @@ public void testRemove3() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         NavigableMap x = map5();

diff --git a/...android/platform/libcore/jsr166-tests/src/test/java/jsr166/ConcurrentSkipListSetTest.java b/...android/platform/libcore/jsr166-tests/src/test/java/jsr166/ConcurrentSkipListSetTest.java
@@ -530,7 +530,7 @@ public void testToString() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         NavigableSet x = populatedSet(SIZE);

diff --git a/...roid/platform/libcore/jsr166-tests/src/test/java/jsr166/ConcurrentSkipListSubMapTest.java b/...roid/platform/libcore/jsr166-tests/src/test/java/jsr166/ConcurrentSkipListSubMapTest.java
@@ -609,7 +609,7 @@ public void testRemove2_NullPointerException() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         NavigableMap x = map5();
@@ -1287,7 +1287,7 @@ public void testDescendingRemove2_NullPointerException() {
      */
     public void testDescendingSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         NavigableMap x = dmap5();

diff --git a/...roid/platform/libcore/jsr166-tests/src/test/java/jsr166/ConcurrentSkipListSubSetTest.java b/...roid/platform/libcore/jsr166-tests/src/test/java/jsr166/ConcurrentSkipListSubSetTest.java
@@ -487,7 +487,7 @@ public void testToString() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         NavigableSet x = populatedSet(SIZE);
@@ -990,7 +990,7 @@ public void testDescendingToString() {
      */
     public void testDescendingSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         NavigableSet x = dset5();

diff --git a/.../android/platform/libcore/jsr166-tests/src/test/java/jsr166/CopyOnWriteArrayListTest.java b/.../android/platform/libcore/jsr166-tests/src/test/java/jsr166/CopyOnWriteArrayListTest.java
@@ -744,7 +744,7 @@ public void testSubList3_IndexOutOfBoundsException() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         List x = populatedArray(SIZE);

diff --git a/...l/android/platform/libcore/jsr166-tests/src/test/java/jsr166/CopyOnWriteArraySetTest.java b/...l/android/platform/libcore/jsr166-tests/src/test/java/jsr166/CopyOnWriteArraySetTest.java
@@ -388,7 +388,7 @@ public void testToArray_ArrayStoreException() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         Set x = populatedSet(SIZE);

diff --git a/...l/android/platform/libcore/jsr166-tests/src/test/java/jsr166/LinkedBlockingDequeTest.java b/...l/android/platform/libcore/jsr166-tests/src/test/java/jsr166/LinkedBlockingDequeTest.java
@@ -1731,7 +1731,7 @@ public void realRun() throws InterruptedException {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         Queue x = populatedDeque(SIZE);

diff --git a/...l/android/platform/libcore/jsr166-tests/src/test/java/jsr166/LinkedBlockingQueueTest.java b/...l/android/platform/libcore/jsr166-tests/src/test/java/jsr166/LinkedBlockingQueueTest.java
@@ -777,7 +777,7 @@ public void realRun() throws InterruptedException {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         Queue x = populatedQueue(SIZE);

diff --git a/...l/android/platform/libcore/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java b/...l/android/platform/libcore/jsr166-tests/src/test/java/jsr166/LinkedTransferQueueTest.java
@@ -654,7 +654,7 @@ public void realRun() throws InterruptedException {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         Queue x = populatedQueue(SIZE);

diff --git a/...android/platform/libcore/jsr166-tests/src/test/java/jsr166/PriorityBlockingQueueTest.java b/...android/platform/libcore/jsr166-tests/src/test/java/jsr166/PriorityBlockingQueueTest.java
@@ -654,7 +654,7 @@ public void realRun() throws InterruptedException {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         Queue x = populatedQueue(SIZE);

diff --git a/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/PriorityQueueTest.java b/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/PriorityQueueTest.java
@@ -495,7 +495,7 @@ public void testToString() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         Queue x = populatedQueue(SIZE);

diff --git a/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/ReentrantLockTest.java b/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/ReentrantLockTest.java
@@ -1108,7 +1108,7 @@ public void realRun() throws InterruptedException {
     public void testSerialization_fair() { testSerialization(true); }
     public void testSerialization(boolean fair) {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         ReentrantLock lock = new ReentrantLock(fair);

diff --git a/...ndroid/platform/libcore/jsr166-tests/src/test/java/jsr166/ReentrantReadWriteLockTest.java b/...ndroid/platform/libcore/jsr166-tests/src/test/java/jsr166/ReentrantReadWriteLockTest.java
@@ -1239,7 +1239,7 @@ public void realRun() throws InterruptedException {
     public void testSerialization_fair() { testSerialization(true); }
     public void testSerialization(boolean fair) {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair);

diff --git a/...emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/SynchronousQueueTest.java b/...emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/SynchronousQueueTest.java
@@ -530,7 +530,7 @@ public void realRun() throws InterruptedException {
      */
     public void testSerialization() {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         final SynchronousQueue x = new SynchronousQueue();

diff --git a/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/TimeUnitTest.java b/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/TimeUnitTest.java
@@ -438,7 +438,7 @@ public void realRun() throws InterruptedException {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         for (TimeUnit x : TimeUnit.values())

diff --git a/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/TreeMapTest.java b/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/TreeMapTest.java
@@ -617,7 +617,7 @@ public void testRemove1_NullPointerException() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         NavigableMap x = map5();

diff --git a/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/TreeSetTest.java b/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/TreeSetTest.java
@@ -533,7 +533,7 @@ public void testToString() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         NavigableSet x = populatedSet(SIZE);

diff --git a/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/TreeSubMapTest.java b/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/TreeSubMapTest.java
@@ -444,7 +444,7 @@ public void testRemove1_NullPointerException() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         NavigableMap x = map5();
@@ -975,7 +975,7 @@ public void testDescendingPut1_NullPointerException() {
      */
     public void testDescendingSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         NavigableMap x = dmap5();

diff --git a/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/TreeSubSetTest.java b/jre_emul/android/platform/libcore/jsr166-tests/src/test/java/jsr166/TreeSubSetTest.java
@@ -484,7 +484,7 @@ public void testToString() {
      */
     public void testSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         NavigableSet x = populatedSet(SIZE);
@@ -976,7 +976,7 @@ public void testDescendingToString() {
      */
     public void testDescendingSerialization() throws Exception {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         NavigableSet x = dset5();

diff --git a/...platform/libcore/luni/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java b/...platform/libcore/luni/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java
@@ -40,7 +40,7 @@ public class AtomicReferenceArray<E> implements java.io.Serializable {
     static {
         try {
             // J2ObjC reflection-stripping change.
-            if (ReflectionUtil.isReflectionStripped()) {
+            if (ReflectionUtil.isJreReflectionStripped()) {
                 ARRAY = 0;
             } else {
                 ARRAY = U.objectFieldOffset

diff --git a/...orm/libcore/luni/src/test/java/libcore/java/util/concurrent/CopyOnWriteArrayListTest.java b/...orm/libcore/luni/src/test/java/libcore/java/util/concurrent/CopyOnWriteArrayListTest.java
@@ -262,7 +262,7 @@ public void testListIterator() {
 
     public void testSerialize() {
         // J2ObjC reflection-stripping change.
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
             return;
         }
         String s = "aced0005737200296a6176612e7574696c2e636f6e63757272656e742e436f70"

diff --git a/jre_emul/android/platform/libcore/ojluni/src/main/java/java/util/logging/LogManager.java b/jre_emul/android/platform/libcore/ojluni/src/main/java/java/util/logging/LogManager.java
@@ -1258,7 +1258,7 @@ public void readConfiguration(InputStream ins) throws IOException {
 
         // Load the properties
         Properties.load0(props, new Properties.LineReader(ins));
-        if (ReflectionUtil.isReflectionStripped()) {
+        if (ReflectionUtil.isJreReflectionStripped()) {
           reflectionStrippedProcessing();
         }
         // Instantiate new configuration objects.