From d97bab862a75b2d5be08bd10c155d5fd1d9fb4f8 Mon Sep 17 00:00:00 2001
From: Gary Gregory <garydgregory@gmail.com>
Date: Thu, 11 Jul 2024 14:50:24 -0400
Subject: [PATCH] Remove redundant keywords

---
 .../commons/collections4/bidimap/AbstractBidiMapTest.java | 8 ++++----
 .../collections4/bidimap/AbstractOrderedBidiMapTest.java  | 6 +++---
 .../commons/collections4/list/AbstractListTest.java       | 6 +++---
 .../commons/collections4/map/AbstractIterableMapTest.java | 8 ++++----
 .../commons/collections4/map/AbstractOrderedMapTest.java  | 6 +++---
 .../org/apache/commons/collections4/map/Flat3MapTest.java | 8 ++++----
 .../apache/commons/collections4/map/LinkedMapTest.java    | 4 ++--
 .../commons/collections4/map/ListOrderedMap2Test.java     | 4 ++--
 .../commons/collections4/map/ListOrderedMapTest.java      | 8 ++++----
 9 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
index ab47f81b2..71961f7b3 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
@@ -116,13 +116,13 @@ public abstract class AbstractBidiMapTest<K, V> extends AbstractIterableMapTest<
 
         @Override
         public V[] addSetValues() {
-            return AbstractBidiMapTest.this.getNewSampleValues();
+            return getNewSampleValues();
         }
 
         @Override
         public Map<K, V> getConfirmedMap() {
             // assumes makeFullMapIterator() called first
-            return AbstractBidiMapTest.this.getConfirmed();
+            return getConfirmed();
         }
 
         @Override
@@ -145,12 +145,12 @@ public abstract class AbstractBidiMapTest<K, V> extends AbstractIterableMapTest<
 
         @Override
         public boolean supportsRemove() {
-            return AbstractBidiMapTest.this.isRemoveSupported();
+            return isRemoveSupported();
         }
 
         @Override
         public boolean supportsSetValue() {
-            return AbstractBidiMapTest.this.isSetValueSupported();
+            return isSetValueSupported();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
index 0cb194337..684d6a271 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
@@ -46,7 +46,7 @@ public abstract class AbstractOrderedBidiMapTest<K, V> extends AbstractBidiMapTe
 
         @Override
         public V[] addSetValues() {
-            return AbstractOrderedBidiMapTest.this.getNewSampleValues();
+            return getNewSampleValues();
         }
 
         @Override
@@ -75,12 +75,12 @@ public abstract class AbstractOrderedBidiMapTest<K, V> extends AbstractBidiMapTe
 
         @Override
         public boolean supportsRemove() {
-            return AbstractOrderedBidiMapTest.this.isRemoveSupported();
+            return isRemoveSupported();
         }
 
         @Override
         public boolean supportsSetValue() {
-            return AbstractOrderedBidiMapTest.this.isSetValueSupported();
+            return isSetValueSupported();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
index 32a5a1e87..4a93d6bdf 100644
--- a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
@@ -136,7 +136,7 @@ public abstract class AbstractListTest<E> extends AbstractCollectionTest<E> {
 
         @Override
         public E addSetValue() {
-            return AbstractListTest.this.getOtherElements()[0];
+            return getOtherElements()[0];
         }
 
         @Override
@@ -153,12 +153,12 @@ public abstract class AbstractListTest<E> extends AbstractCollectionTest<E> {
 
         @Override
         public boolean supportsAdd() {
-            return AbstractListTest.this.isAddSupported();
+            return isAddSupported();
         }
 
         @Override
         public boolean supportsRemove() {
-            return AbstractListTest.this.isRemoveSupported();
+            return isRemoveSupported();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java
index 78ca9b0e3..58e5038d3 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java
@@ -43,13 +43,13 @@ public abstract class AbstractIterableMapTest<K, V> extends AbstractMapTest<K, V
 
         @Override
         public V[] addSetValues() {
-            return AbstractIterableMapTest.this.getNewSampleValues();
+            return getNewSampleValues();
         }
 
         @Override
         public Map<K, V> getConfirmedMap() {
             // assumes makeFullMapIterator() called first
-            return AbstractIterableMapTest.this.getConfirmed();
+            return getConfirmed();
         }
 
         @Override
@@ -77,12 +77,12 @@ public abstract class AbstractIterableMapTest<K, V> extends AbstractMapTest<K, V
 
         @Override
         public boolean supportsRemove() {
-            return AbstractIterableMapTest.this.isRemoveSupported();
+            return isRemoveSupported();
         }
 
         @Override
         public boolean supportsSetValue() {
-            return AbstractIterableMapTest.this.isSetValueSupported();
+            return isSetValueSupported();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
index 9caf0c4fc..e9302d4c0 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
@@ -49,7 +49,7 @@ public abstract class AbstractOrderedMapTest<K, V> extends AbstractIterableMapTe
         @Override
         public Map<K, V> getConfirmedMap() {
             // assumes makeFullMapIterator() called first
-            return AbstractOrderedMapTest.this.getConfirmed();
+            return getConfirmed();
         }
 
         @Override
@@ -77,12 +77,12 @@ public abstract class AbstractOrderedMapTest<K, V> extends AbstractIterableMapTe
 
         @Override
         public boolean supportsRemove() {
-            return AbstractOrderedMapTest.this.isRemoveSupported();
+            return isRemoveSupported();
         }
 
         @Override
         public boolean supportsSetValue() {
-            return AbstractOrderedMapTest.this.isSetValueSupported();
+            return isSetValueSupported();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
index 58f7869a4..0e85dbf44 100644
--- a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
@@ -51,13 +51,13 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
         @Override
         public V[] addSetValues() {
-            return Flat3MapTest.this.getNewSampleValues();
+            return getNewSampleValues();
         }
 
         @Override
         public Map<K, V> getConfirmedMap() {
             // assumes makeFullMapIterator() called first
-            return Flat3MapTest.this.getConfirmed();
+            return getConfirmed();
         }
 
         @Override
@@ -80,12 +80,12 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
         @Override
         public boolean supportsRemove() {
-            return Flat3MapTest.this.isRemoveSupported();
+            return isRemoveSupported();
         }
 
         @Override
         public boolean supportsSetValue() {
-            return Flat3MapTest.this.isSetValueSupported();
+            return isSetValueSupported();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java b/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
index bce52b9b8..6d58d40a5 100644
--- a/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
@@ -45,7 +45,7 @@ public class LinkedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
         @Override
         public K[] getFullElements() {
-            return LinkedMapTest.this.getSampleKeys();
+            return getSampleKeys();
         }
 
         @Override
@@ -55,7 +55,7 @@ public class LinkedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
         @Override
         public boolean isNullSupported() {
-            return LinkedMapTest.this.isAllowNullKey();
+            return isAllowNullKey();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java b/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
index 1da829647..4e6c89804 100644
--- a/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
+++ b/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
@@ -41,7 +41,7 @@ public class ListOrderedMap2Test<K, V> extends AbstractOrderedMapTest<K, V> {
 
         @Override
         public K[] getFullElements() {
-            return ListOrderedMap2Test.this.getSampleKeys();
+            return getSampleKeys();
         }
 
         @Override
@@ -51,7 +51,7 @@ public class ListOrderedMap2Test<K, V> extends AbstractOrderedMapTest<K, V> {
 
         @Override
         public boolean isNullSupported() {
-            return ListOrderedMap2Test.this.isAllowNullKey();
+            return isAllowNullKey();
         }
 
         @Override
diff --git a/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
index 2b2e4e608..e05f52021 100644
--- a/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
@@ -47,7 +47,7 @@ public class ListOrderedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
         @Override
         public K[] getFullElements() {
-            return ListOrderedMapTest.this.getSampleKeys();
+            return getSampleKeys();
         }
 
         @Override
@@ -57,7 +57,7 @@ public class ListOrderedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
         @Override
         public boolean isNullSupported() {
-            return ListOrderedMapTest.this.isAllowNullKey();
+            return isAllowNullKey();
         }
 
         @Override
@@ -95,7 +95,7 @@ public class ListOrderedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
         @Override
         public V[] getFullElements() {
-            return ListOrderedMapTest.this.getSampleValues();
+            return getSampleValues();
         }
 
         @Override
@@ -105,7 +105,7 @@ public class ListOrderedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
         @Override
         public boolean isNullSupported() {
-            return ListOrderedMapTest.this.isAllowNullKey();
+            return isAllowNullKey();
         }
 
         @Override