You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2017/05/22 18:28:58 UTC

[02/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses of final from internal classes

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
index 9ab7406..354a9f7 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
@@ -744,14 +744,14 @@ public class AutoSerializableManager {
 
     public abstract void orderedDeserialize(InternalPdxReader reader, Object obj);
 
-    protected final Object readTransformIf(Object o, Object serializedValue)
+    protected Object readTransformIf(Object o, Object serializedValue)
         throws IllegalArgumentException, IllegalAccessException {
       if (!transform())
         return serializedValue;
       return readTransform(o, serializedValue);
     }
 
-    protected final Object readTransform(Object o, Object serializedValue)
+    protected Object readTransform(Object o, Object serializedValue)
         throws IllegalArgumentException, IllegalAccessException {
       return this.owner.getOwner().readTransform(getField(), o.getClass(), serializedValue);
     }
@@ -850,7 +850,7 @@ public class AutoSerializableManager {
     }
   }
 
-  public static final class IntField extends PdxFieldWrapper {
+  public static class IntField extends PdxFieldWrapper {
     public IntField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
         boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -907,7 +907,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class ByteField extends PdxFieldWrapper {
+  public static class ByteField extends PdxFieldWrapper {
     public ByteField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
         boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -964,7 +964,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class LongField extends PdxFieldWrapper {
+  public static class LongField extends PdxFieldWrapper {
     public LongField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
         boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1021,7 +1021,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class BooleanField extends PdxFieldWrapper {
+  public static class BooleanField extends PdxFieldWrapper {
     public BooleanField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
         boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1078,7 +1078,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class CharField extends PdxFieldWrapper {
+  public static class CharField extends PdxFieldWrapper {
     public CharField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
         boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1135,7 +1135,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class ShortField extends PdxFieldWrapper {
+  public static class ShortField extends PdxFieldWrapper {
     public ShortField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
         boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1192,7 +1192,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class FloatField extends PdxFieldWrapper {
+  public static class FloatField extends PdxFieldWrapper {
     public FloatField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
         boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1249,7 +1249,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class DoubleField extends PdxFieldWrapper {
+  public static class DoubleField extends PdxFieldWrapper {
     public DoubleField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
         boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1306,7 +1306,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class ObjectField extends PdxFieldWrapper {
+  public static class ObjectField extends PdxFieldWrapper {
     public ObjectField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
         boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1351,7 +1351,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class StringField extends PdxFieldWrapper {
+  public static class StringField extends PdxFieldWrapper {
     public StringField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
         boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1396,7 +1396,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class DateField extends PdxFieldWrapper {
+  public static class DateField extends PdxFieldWrapper {
     public DateField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
         boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1441,7 +1441,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class ByteArrayField extends PdxFieldWrapper {
+  public static class ByteArrayField extends PdxFieldWrapper {
     public ByteArrayField(AutoSerializableManager owner, Field f, String name,
         boolean transformValue, boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1486,7 +1486,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class BooleanArrayField extends PdxFieldWrapper {
+  public static class BooleanArrayField extends PdxFieldWrapper {
     public BooleanArrayField(AutoSerializableManager owner, Field f, String name,
         boolean transformValue, boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1531,7 +1531,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class ShortArrayField extends PdxFieldWrapper {
+  public static class ShortArrayField extends PdxFieldWrapper {
     public ShortArrayField(AutoSerializableManager owner, Field f, String name,
         boolean transformValue, boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1576,7 +1576,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class CharArrayField extends PdxFieldWrapper {
+  public static class CharArrayField extends PdxFieldWrapper {
     public CharArrayField(AutoSerializableManager owner, Field f, String name,
         boolean transformValue, boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1621,7 +1621,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class IntArrayField extends PdxFieldWrapper {
+  public static class IntArrayField extends PdxFieldWrapper {
     public IntArrayField(AutoSerializableManager owner, Field f, String name,
         boolean transformValue, boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1666,7 +1666,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class LongArrayField extends PdxFieldWrapper {
+  public static class LongArrayField extends PdxFieldWrapper {
     public LongArrayField(AutoSerializableManager owner, Field f, String name,
         boolean transformValue, boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1711,7 +1711,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class FloatArrayField extends PdxFieldWrapper {
+  public static class FloatArrayField extends PdxFieldWrapper {
     public FloatArrayField(AutoSerializableManager owner, Field f, String name,
         boolean transformValue, boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1756,7 +1756,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class DoubleArrayField extends PdxFieldWrapper {
+  public static class DoubleArrayField extends PdxFieldWrapper {
     public DoubleArrayField(AutoSerializableManager owner, Field f, String name,
         boolean transformValue, boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1801,7 +1801,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class StringArrayField extends PdxFieldWrapper {
+  public static class StringArrayField extends PdxFieldWrapper {
     public StringArrayField(AutoSerializableManager owner, Field f, String name,
         boolean transformValue, boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1846,7 +1846,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class ByteArrayArrayField extends PdxFieldWrapper {
+  public static class ByteArrayArrayField extends PdxFieldWrapper {
     public ByteArrayArrayField(AutoSerializableManager owner, Field f, String name,
         boolean transformValue, boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);
@@ -1891,7 +1891,7 @@ public class AutoSerializableManager {
       }
     }
   }
-  public static final class ObjectArrayField extends PdxFieldWrapper {
+  public static class ObjectArrayField extends PdxFieldWrapper {
     public ObjectArrayField(AutoSerializableManager owner, Field f, String name,
         boolean transformValue, boolean isIdentityField) {
       super(owner, f, name, transformValue, isIdentityField);

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java b/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
index 9ffc075..4dc4db7 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
@@ -595,7 +595,7 @@ public class GeodeRedisServer {
     }
   }
 
-  private final class MetaCacheListener extends CacheListenerAdapter<String, RedisDataType> {
+  private class MetaCacheListener extends CacheListenerAdapter<String, RedisDataType> {
 
     @Override
     public void afterCreate(EntryEvent<String, RedisDataType> event) {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/internal/Coder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/Coder.java b/geode-core/src/main/java/org/apache/geode/redis/internal/Coder.java
index 928f345..f032316 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/Coder.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/Coder.java
@@ -107,7 +107,7 @@ public class Coder {
    */
   public static final String N_INF = "-inf";
 
-  public static final ByteBuf getBulkStringResponse(ByteBufAllocator alloc, byte[] value) {
+  public static ByteBuf getBulkStringResponse(ByteBufAllocator alloc, byte[] value) {
     ByteBuf response = alloc.buffer(value.length + 20);
     response.writeByte(BULK_STRING_ID);
     response.writeBytes(intToBytes(value.length));
@@ -117,7 +117,7 @@ public class Coder {
     return response;
   }
 
-  public static final ByteBuf getBulkStringResponse(ByteBufAllocator alloc, double value) {
+  public static ByteBuf getBulkStringResponse(ByteBufAllocator alloc, double value) {
     ByteBuf response = alloc.buffer();
     byte[] doub = doubleToBytes(value);
     response.writeByte(BULK_STRING_ID);
@@ -128,7 +128,7 @@ public class Coder {
     return response;
   }
 
-  public static final ByteBuf getBulkStringResponse(ByteBufAllocator alloc, String value) {
+  public static ByteBuf getBulkStringResponse(ByteBufAllocator alloc, String value) {
     byte[] valueAr = stringToBytes(value);
     int length = valueAr == null ? 0 : valueAr.length;
     ByteBuf response = alloc.buffer(length + 20);
@@ -140,8 +140,7 @@ public class Coder {
     return response;
   }
 
-  public static final ByteBuf getBulkStringArrayResponse(ByteBufAllocator alloc,
-      List<String> items) {
+  public static ByteBuf getBulkStringArrayResponse(ByteBufAllocator alloc, List<String> items) {
     Iterator<String> it = items.iterator();
     ByteBuf response = alloc.buffer();
     response.writeByte(ARRAY_ID);
@@ -158,7 +157,7 @@ public class Coder {
     return response;
   }
 
-  public static final ByteBuf getBulkStringArrayResponse(ByteBufAllocator alloc,
+  public static ByteBuf getBulkStringArrayResponse(ByteBufAllocator alloc,
       Collection<ByteArrayWrapper> items) {
     Iterator<ByteArrayWrapper> it = items.iterator();
     ByteBuf response = alloc.buffer();
@@ -180,7 +179,7 @@ public class Coder {
     return response;
   }
 
-  public static final ByteBuf getKeyValArrayResponse(ByteBufAllocator alloc,
+  public static ByteBuf getKeyValArrayResponse(ByteBufAllocator alloc,
       Collection<Entry<ByteArrayWrapper, ByteArrayWrapper>> items) {
     Iterator<Map.Entry<ByteArrayWrapper, ByteArrayWrapper>> it = items.iterator();
     ByteBuf response = alloc.buffer();
@@ -220,7 +219,7 @@ public class Coder {
     return response;
   }
 
-  public static final ByteBuf getScanResponse(ByteBufAllocator alloc, List<?> items) {
+  public static ByteBuf getScanResponse(ByteBufAllocator alloc, List<?> items) {
     ByteBuf response = alloc.buffer();
     response.writeByte(ARRAY_ID);
     response.writeBytes(intToBytes(2));
@@ -258,12 +257,12 @@ public class Coder {
     return response;
   }
 
-  public static final ByteBuf getEmptyArrayResponse(ByteBufAllocator alloc) {
+  public static ByteBuf getEmptyArrayResponse(ByteBufAllocator alloc) {
     ByteBuf buf = alloc.buffer().writeBytes(bEMPTY_ARRAY);
     return buf;
   }
 
-  public static final ByteBuf getSimpleStringResponse(ByteBufAllocator alloc, String string) {
+  public static ByteBuf getSimpleStringResponse(ByteBufAllocator alloc, String string) {
     byte[] simpAr = stringToBytes(string);
 
     ByteBuf response = alloc.buffer(simpAr.length + 20);
@@ -273,7 +272,7 @@ public class Coder {
     return response;
   }
 
-  public static final ByteBuf getErrorResponse(ByteBufAllocator alloc, String error) {
+  public static ByteBuf getErrorResponse(ByteBufAllocator alloc, String error) {
     byte[] errorAr = stringToBytes(error);
     ByteBuf response = alloc.buffer(errorAr.length + 25);
     response.writeByte(ERROR_ID);
@@ -283,7 +282,7 @@ public class Coder {
     return response;
   }
 
-  public static final ByteBuf getNoAuthResponse(ByteBufAllocator alloc, String error) {
+  public static ByteBuf getNoAuthResponse(ByteBufAllocator alloc, String error) {
     byte[] errorAr = stringToBytes(error);
     ByteBuf response = alloc.buffer(errorAr.length + 25);
     response.writeByte(ERROR_ID);
@@ -293,7 +292,7 @@ public class Coder {
     return response;
   }
 
-  public static final ByteBuf getWrongTypeResponse(ByteBufAllocator alloc, String error) {
+  public static ByteBuf getWrongTypeResponse(ByteBufAllocator alloc, String error) {
     byte[] errorAr = stringToBytes(error);
     ByteBuf response = alloc.buffer(errorAr.length + 31);
     response.writeByte(ERROR_ID);
@@ -303,7 +302,7 @@ public class Coder {
     return response;
   }
 
-  public static final ByteBuf getIntegerResponse(ByteBufAllocator alloc, int integer) {
+  public static ByteBuf getIntegerResponse(ByteBufAllocator alloc, int integer) {
     ByteBuf response = alloc.buffer(15);
     response.writeByte(INTEGER_ID);
     response.writeBytes(intToBytes(integer));
@@ -311,7 +310,7 @@ public class Coder {
     return response;
   }
 
-  public static final ByteBuf getIntegerResponse(ByteBufAllocator alloc, long l) {
+  public static ByteBuf getIntegerResponse(ByteBufAllocator alloc, long l) {
     ByteBuf response = alloc.buffer(25);
     response.writeByte(INTEGER_ID);
     response.writeBytes(longToBytes(l));
@@ -319,7 +318,7 @@ public class Coder {
     return response;
   }
 
-  public static final ByteBuf getNilResponse(ByteBufAllocator alloc) {
+  public static ByteBuf getNilResponse(ByteBufAllocator alloc) {
     ByteBuf buf = alloc.buffer().writeBytes(bNIL);
     return buf;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/internal/RegionProvider.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/RegionProvider.java b/geode-core/src/main/java/org/apache/geode/redis/internal/RegionProvider.java
index 1de73a0..94ff50c 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/RegionProvider.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/RegionProvider.java
@@ -475,7 +475,7 @@ public class RegionProvider implements Closeable {
    * @param delay The delay in milliseconds of the expiration
    * @return True is expiration set, false otherwise
    */
-  public final boolean setExpiration(ByteArrayWrapper key, long delay) {
+  public boolean setExpiration(ByteArrayWrapper key, long delay) {
     RedisDataType type = getRedisDataType(key);
     if (type == null)
       return false;
@@ -492,7 +492,7 @@ public class RegionProvider implements Closeable {
    * @param delay Delay in milliseconds to reset the expiration to
    * @return True if reset, false if not
    */
-  public final boolean modifyExpiration(ByteArrayWrapper key, long delay) {
+  public boolean modifyExpiration(ByteArrayWrapper key, long delay) {
     /*
      * Attempt to cancel future task
      */
@@ -517,7 +517,7 @@ public class RegionProvider implements Closeable {
    * @param key Key
    * @return True is expiration cancelled on the key, false otherwise
    */
-  public final boolean cancelKeyExpiration(ByteArrayWrapper key) {
+  public boolean cancelKeyExpiration(ByteArrayWrapper key) {
     ScheduledFuture<?> future = expirationsMap.remove(key);
     if (future == null)
       return false;
@@ -544,7 +544,7 @@ public class RegionProvider implements Closeable {
    * @param key Key
    * @return Remaining time in milliseconds or 0 if no delay or key doesn't exist
    */
-  public final long getExpirationDelayMillis(ByteArrayWrapper key) {
+  public long getExpirationDelayMillis(ByteArrayWrapper key) {
     ScheduledFuture<?> future = this.expirationsMap.get(key);
     return future != null ? future.getDelay(TimeUnit.MILLISECONDS) : 0L;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/HllExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/HllExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/HllExecutor.java
index e440c09..c1b0488 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/HllExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/HllExecutor.java
@@ -26,7 +26,7 @@ public abstract class HllExecutor extends AbstractExecutor {
   public static final Integer DEFAULT_HLL_DENSE = 18;
   public static final Integer DEFAULT_HLL_SPARSE = 32;
 
-  protected final void checkAndSetDataType(ByteArrayWrapper key, ExecutionHandlerContext context) {
+  protected void checkAndSetDataType(ByteArrayWrapper key, ExecutionHandlerContext context) {
     Object oldVal = context.getRegionProvider().metaPutIfAbsent(key, RedisDataType.REDIS_HLL);
     if (oldVal == RedisDataType.REDIS_PROTECTED)
       throw new RedisDataTypeMismatchException("The key name \"" + key + "\" is protected");

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/Varint.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/Varint.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/Varint.java
index da370ce..783069a 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/Varint.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/Varint.java
@@ -48,7 +48,7 @@ import java.io.IOException;
  * "compatible" with variable-length encoding.
  * </p>
  */
-public final class Varint {
+public class Varint {
 
   private Varint() {}
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/ListExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/ListExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/ListExecutor.java
index fd518b9..cb365e6 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/ListExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/ListExecutor.java
@@ -32,7 +32,7 @@ public abstract class ListExecutor extends AbstractExecutor {
     LEFT, RIGHT
   };
 
-  protected final static QueryService getQueryService() {
+  protected static QueryService getQueryService() {
     return GemFireCacheImpl.getInstance().getQueryService();
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java
index 4466521..19bd199 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java
@@ -197,7 +197,7 @@ public class ZRangeByLexExecutor extends SortedSetExecutor {
 
   }
 
-  private final ByteBuf getCustomBulkStringArrayResponse(Collection<ByteArrayWrapper> items,
+  private ByteBuf getCustomBulkStringArrayResponse(Collection<ByteArrayWrapper> items,
       ExecutionHandlerContext context) {
     Iterator<ByteArrayWrapper> it = items.iterator();
     ByteBuf response = context.getByteBufAllocator().buffer();

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/StringExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/StringExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/StringExecutor.java
index fb91f09..eb17e41 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/StringExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/StringExecutor.java
@@ -22,7 +22,7 @@ import org.apache.geode.redis.internal.executor.AbstractExecutor;
 
 public abstract class StringExecutor extends AbstractExecutor {
 
-  protected final void checkAndSetDataType(ByteArrayWrapper key, ExecutionHandlerContext context) {
+  protected void checkAndSetDataType(ByteArrayWrapper key, ExecutionHandlerContext context) {
     Object oldVal = context.getRegionProvider().metaPutIfAbsent(key, RedisDataType.REDIS_STRING);
     if (oldVal == RedisDataType.REDIS_PROTECTED)
       throw new RedisDataTypeMismatchException("The key name \"" + key + "\" is protected");

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/security/GemFireSecurityException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/security/GemFireSecurityException.java b/geode-core/src/main/java/org/apache/geode/security/GemFireSecurityException.java
index 22c0302..2cab06c 100644
--- a/geode-core/src/main/java/org/apache/geode/security/GemFireSecurityException.java
+++ b/geode-core/src/main/java/org/apache/geode/security/GemFireSecurityException.java
@@ -76,7 +76,7 @@ public class GemFireSecurityException extends GemFireException {
   }
 
   @Override
-  public final synchronized Throwable getCause() {
+  public synchronized Throwable getCause() {
     return (this.cause == this ? null : this.cause);
   }
 
@@ -86,7 +86,7 @@ public class GemFireSecurityException extends GemFireException {
    * @param object the {@code object} to test for implementing {@code Serializable}.
    * @return true if the provided {@code object} implements {@code Serializable}.
    */
-  protected final boolean isSerializable(final Object object) {
+  protected boolean isSerializable(final Object object) {
     if (object == null) {
       return true;
     }
@@ -100,7 +100,7 @@ public class GemFireSecurityException extends GemFireException {
    * @return {@code NamingException#getResolvedObj()} if the {@code cause} is a
    *         {@code NamingException}.
    */
-  protected final Object getResolvedObj() {
+  protected Object getResolvedObj() {
     final Throwable thisCause = this.cause;
     if (thisCause != null && NamingException.class.isInstance(thisCause)) {
       return ((NamingException) thisCause).getResolvedObj();

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
index 1f001b0..ee1fb38 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -249,7 +249,7 @@ public class ClientServerRegisterInterestsDUnitTest extends JUnit4DistributedTes
     }
   }
 
-  protected final class TestEntryCacheListener extends CacheListenerAdapter<String, String> {
+  protected class TestEntryCacheListener extends CacheListenerAdapter<String, String> {
 
     @Override
     public void afterCreate(final EntryEvent<String, String> event) {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
index 5db1559..8af44eb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
@@ -2443,7 +2443,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
   /**
    * Used to return and report remote CacheServer port info.
    */
-  private static final class ServerPorts implements Serializable {
+  private static class ServerPorts implements Serializable {
     private final int port;
 
     ServerPorts(int port) {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
index 634e9ba..c8f80a3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
@@ -375,7 +375,7 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends JUnit4CacheTes
       }
     });
 
-    final class LocalTestHook implements TestHook {
+    class LocalTestHook implements TestHook {
 
       @Override
       public void hook(int spot) throws RuntimeException {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
index ae8da22..582ca5e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
@@ -279,7 +279,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
       public void run2() throws CacheException {
 
         // Helper classes and function
-        final class TestQueryFunction extends FunctionAdapter {
+        class TestQueryFunction extends FunctionAdapter {
 
           @Override
           public boolean hasResult() {
@@ -1539,7 +1539,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
       public void run2() throws CacheException {
 
         // Helper classes and function
-        final class TestQueryFunction extends FunctionAdapter {
+        class TestQueryFunction extends FunctionAdapter {
 
           @Override
           public boolean hasResult() {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
index 827f2a7..77c66ad 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
@@ -2425,7 +2425,7 @@ public class PRQueryDUnitHelper implements Serializable {
   }
 
   // Helper classes and function
-  final class TestQueryFunction extends FunctionAdapter {
+  class TestQueryFunction extends FunctionAdapter {
 
     @Override
     public boolean hasResult() {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
index 196a88b..335f59b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
@@ -385,7 +385,7 @@ public class SnapshotDUnitTest extends JUnit4CacheTestCase {
     }
   }
 
-  private static final class CountingAsyncEventListener implements AsyncEventListener {
+  private static class CountingAsyncEventListener implements AsyncEventListener {
 
     private final AtomicInteger events = new AtomicInteger();
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
index 8aae5d5..a6dd126 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
@@ -1568,7 +1568,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
   }
 
   // Simple DistributedMember implementation
-  static final class TestDistributedMember implements DistributedMember {
+  static class TestDistributedMember implements DistributedMember {
 
     private String host;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpUtf8.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpUtf8.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpUtf8.java
index 9ac3ab0..ba630fa 100644
--- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpUtf8.java
+++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpUtf8.java
@@ -49,7 +49,7 @@ public class CpUtf8 extends Cp {
   }
 
   /**
-   * decode the class name of the given argument, or the final class name if the argument is zero
+   * decode the class name of the given argument, or the class name if the argument is zero
    */
   public String decodeClassName(int argNo) {
     int idx;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
index feba601..62d4bdd 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
@@ -249,7 +249,7 @@ public class AbstractLauncherTest {
                 + TimeUnit.MINUTES.toMillis(30) + TimeUnit.SECONDS.toMillis(1)));
   }
 
-  private static final class FakeServiceLauncher extends AbstractLauncher<String> {
+  private static class FakeServiceLauncher extends AbstractLauncher<String> {
 
     private final String memberId;
     private final String memberName;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
index 85bed3e..f5d6271 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
@@ -827,7 +827,7 @@ public class ServerLauncherTest {
     serverLauncher.startCacheServer(mockCache);
   }
 
-  private final class ServerWaitMultiThreadedTestCase extends MultithreadedTestCase {
+  private class ServerWaitMultiThreadedTestCase extends MultithreadedTestCase {
 
     private final AtomicBoolean connectionStateHolder = new AtomicBoolean(true);
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
index b9a601d..ccdd02e 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
@@ -114,7 +114,7 @@ public class Bug40751DUnitTest extends JUnit4CacheTestCase {
   }
 
 
-  private static final class MyClass implements DataSerializable {
+  private static class MyClass implements DataSerializable {
 
 
     public MyClass() {}

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
index 3cdfd01..f17b40b 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
@@ -86,7 +86,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
     SpyAuthenticator.clear();
   }
 
-  protected static final class AuthInitCreateReturnsNull implements AuthInitialize {
+  protected static class AuthInitCreateReturnsNull implements AuthInitialize {
 
     public static AuthInitialize create() {
       return null;
@@ -106,7 +106,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
     public void close() {}
   }
 
-  protected static final class SpyAuthInit implements AuthInitialize {
+  protected static class SpyAuthInit implements AuthInitialize {
 
     private static SpyAuthInit instance = null;
     private static int createCount = 0;
@@ -151,7 +151,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
         throws AuthenticationFailedException {}
   }
 
-  protected static final class AuthInitGetCredentialsAndInitThrow implements AuthInitialize {
+  protected static class AuthInitGetCredentialsAndInitThrow implements AuthInitialize {
 
     public static AuthInitialize create() {
       return new AuthInitGetCredentialsAndInitThrow();
@@ -173,7 +173,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
     public void close() {}
   }
 
-  protected static final class AuthInitGetCredentialsThrows implements AuthInitialize {
+  protected static class AuthInitGetCredentialsThrows implements AuthInitialize {
 
     public static AuthInitialize create() {
       return new AuthInitGetCredentialsThrows();
@@ -193,7 +193,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
     public void close() {}
   }
 
-  protected static final class AuthenticatorReturnsNulls implements Authenticator {
+  protected static class AuthenticatorReturnsNulls implements Authenticator {
 
     public static Authenticator create() {
       return null;
@@ -213,7 +213,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
     public void close() {}
   }
 
-  protected static final class AuthenticatorInitThrows implements Authenticator {
+  protected static class AuthenticatorInitThrows implements Authenticator {
 
     public static Authenticator create() {
       return new AuthenticatorInitThrows();
@@ -235,7 +235,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
     public void close() {}
   }
 
-  protected static final class AuthenticatorAuthenticateThrows implements Authenticator {
+  protected static class AuthenticatorAuthenticateThrows implements Authenticator {
 
     public static Authenticator create() {
       return new AuthenticatorAuthenticateThrows();
@@ -255,7 +255,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
     public void close() {}
   }
 
-  protected static final class SpyAuthenticator implements Authenticator {
+  protected static class SpyAuthenticator implements Authenticator {
 
     private static Authenticator instance = null;
     private static int createCount = 0;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java
index 6bf9c35..6d1b493 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java
@@ -205,7 +205,7 @@ public class StreamingOperationManyDUnitTest extends JUnit4DistributedTestCase {
     }
   }
 
-  public static final class TestRequestStreamingMessageManyProviderNoExceptions
+  public static class TestRequestStreamingMessageManyProviderNoExceptions
       extends StreamingOperation.RequestStreamingMessage {
     private int nextInt = -10;
     private int count = 0;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java
index 74fb665..310087e 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java
@@ -168,7 +168,7 @@ public class StreamingOperationOneDUnitTest extends JUnit4DistributedTestCase {
     }
   }
 
-  public static final class TestRequestStreamingMessageOneProviderNoExceptions
+  public static class TestRequestStreamingMessageOneProviderNoExceptions
       extends StreamingOperation.RequestStreamingMessage {
     private int nextInt = -10;
     private int count = 0;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
index fe79801..bd9a424 100644
--- a/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
@@ -1849,7 +1849,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
 
       // spawn a new thread modify and custIdOne in another tx
       // so that outer thread fails
-      final class TxThread extends Thread {
+      class TxThread extends Thread {
         public void run() {
           CacheTransactionManager mgr = getGemfireCache().getTxManager();
           mgr.setDistributed(true);
@@ -1931,7 +1931,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
   }
 
 
-  final class TxConflictRunnable implements Runnable {
+  class TxConflictRunnable implements Runnable {
     final String regionName;
 
     public TxConflictRunnable(String regionName) {
@@ -1942,7 +1942,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
     public void run() {
       // spawn a new thread modify and custIdOne in another tx
       // so that outer thread fails
-      final class TxThread extends Thread {
+      class TxThread extends Thread {
         public boolean gotConflict = false;
         public boolean gotOtherException = false;
         public Exception ex = new Exception();
@@ -2071,7 +2071,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
   }
 
 
-  final class TxRunnable implements Runnable {
+  class TxRunnable implements Runnable {
     final String regionName;
 
     public TxRunnable(String regionName) {
@@ -2080,7 +2080,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
 
     @Override
     public void run() {
-      final class TxThread extends Thread {
+      class TxThread extends Thread {
         public boolean gotException = false;
         public Exception ex = new Exception();
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
index 33091c9..b42a923 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
@@ -236,7 +236,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
     fromDataPre70Called = false;
   }
 
-  public static final class TestMessage implements DataSerializableFixedID {
+  public static class TestMessage implements DataSerializableFixedID {
     /** The versions in which this message was modified */
     private static final Version[] dsfidVersions = new Version[] {Version.GFE_66, Version.GFE_70};
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/TestDelta.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TestDelta.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TestDelta.java
index 14f05b1..b0f8b37 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TestDelta.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TestDelta.java
@@ -25,7 +25,7 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.Delta;
 import org.apache.geode.InvalidDeltaException;
 
-public final class TestDelta implements Delta, DataSerializable, Cloneable {
+public class TestDelta implements Delta, DataSerializable, Cloneable {
 
   public boolean hasDelta;
   public String info;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java
index 89379dc..a378323 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
  *
  * @since GemFire 8.1
  */
-public final class MockCacheExtension extends AbstractMockExtension<Cache> {
+public class MockCacheExtension extends AbstractMockExtension<Cache> {
   public MockCacheExtension(final String value) {
     super(value);
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
index f4f0412..235fe43 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
  *
  * @since GemFire 8.1
  */
-public final class MockCacheExtensionXmlGenerator extends AbstractMockExtensionXmlGenerator<Cache> {
+public class MockCacheExtensionXmlGenerator extends AbstractMockExtensionXmlGenerator<Cache> {
   public MockCacheExtensionXmlGenerator(MockCacheExtension extension) {
     super(extension);
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java
index cff8337..9524803 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
  *
  * @since GemFire 8.1
  */
-public final class MockRegionExtension extends AbstractMockExtension<Region<?, ?>> {
+public class MockRegionExtension extends AbstractMockExtension<Region<?, ?>> {
   public MockRegionExtension(final String value) {
     super(value);
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
index cf80b53..84aa1f9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
  *
  * @since GemFire 8.1
  */
-public final class MockRegionExtensionXmlGenerator
+public class MockRegionExtensionXmlGenerator
     extends AbstractMockExtensionXmlGenerator<Region<?, ?>> {
   public MockRegionExtensionXmlGenerator(MockRegionExtension extension) {
     super(extension);

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
index 5705c09..9eca33a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
@@ -139,8 +139,7 @@ public class Bug39356DUnitTest extends JUnit4CacheTestCase {
     vm2.invoke(verifyBuckets);
   }
 
-  protected final class MyRegionObserver extends DistributionMessageObserver
-      implements Serializable {
+  protected class MyRegionObserver extends DistributionMessageObserver implements Serializable {
     private final VM vm0;
 
     /**

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
index ba3444c..3ee5cf0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
@@ -2238,8 +2238,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
     vm3.invoke(createPersistentReplicate);
   }
 
-  private static final class RecoveryObserver
-      extends InternalResourceManager.ResourceObserverAdapter {
+  private static class RecoveryObserver extends InternalResourceManager.ResourceObserverAdapter {
     final CountDownLatch recoveryDone = new CountDownLatch(1);
 
     @Override

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
index 0dd9775..9fa8d64 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
@@ -243,7 +243,7 @@ public class StreamingPartitionOperationManyDUnitTest extends JUnit4CacheTestCas
     }
   }
 
-  public static final class TestStreamingPartitionMessageManyProviderNoExceptions
+  public static class TestStreamingPartitionMessageManyProviderNoExceptions
       extends StreamingPartitionOperation.StreamingPartitionMessage {
     private int nextInt = -10;
     private int count = 0;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
index d18bd66..1cf89c0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
@@ -218,7 +218,7 @@ public class StreamingPartitionOperationOneDUnitTest extends JUnit4CacheTestCase
     }
   }
 
-  public static final class TestStreamingPartitionMessageOneProviderNoExceptions
+  public static class TestStreamingPartitionMessageOneProviderNoExceptions
       extends StreamingPartitionOperation.StreamingPartitionMessage {
     private int nextInt = -10;
     private int count = 0;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
index b7adff0..3dd0550 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
@@ -1690,7 +1690,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
     });
   }
 
-  private static final class BucketMovingAsyncEventListener implements AsyncEventListener {
+  private static class BucketMovingAsyncEventListener implements AsyncEventListener {
     private final DistributedMember destination;
     private boolean moved;
     private Set<Object> keysSeen = new HashSet<Object>();

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
index 2b8690a..e45a06b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
@@ -156,7 +156,7 @@ public class ParallelQueueRemovalMessageJUnitTest {
 
     when(pa.getColocatedWith()).thenReturn(null);
 
-    // final classes cannot be mocked
+    // classes cannot be mocked
     ProxyBucketRegion pbr = new ProxyBucketRegion(BUCKET_ID, this.queueRegion, pbrIra);
 
     when(ba.getProxyBucketRegion()).thenReturn(pbr);

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
index f904b07..dff049c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
@@ -141,7 +141,7 @@ public class AbstractXmlParserJUnitTest {
     new MockXmlParser().skippedEntity(null);
   }
 
-  private static final class MockXmlParser extends AbstractXmlParser {
+  private static class MockXmlParser extends AbstractXmlParser {
     @Override
     public void startElement(String uri, String localName, String qName, Attributes atts)
         throws SAXException {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
index cfb9f94..5f5d284 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
@@ -633,7 +633,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
     });
   }
 
-  public static final class StatCompressor implements Compressor, Serializable {
+  public static class StatCompressor implements Compressor, Serializable {
     private static final long serialVersionUID = 8116784819434199537L;
 
     private final byte[] POST_COMPRESS_BYTES =
@@ -697,7 +697,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
   /**
    * Used to record compression statistics.
    */
-  private static final class CompressionStats {
+  private static class CompressionStats {
     long vmTotalCompressionTime = 0;
     long region1TotalCompressionTime = 0;
     long region2TotalCompressionTime = 0;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
index 020dcfe..46ee1f4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
@@ -162,7 +162,7 @@ public class ObjectUtilsJUnitTest {
         new Class[] {String.class}, " is the loneliest number!"));
   }
 
-  private static final class ValueHolder<T> {
+  private static class ValueHolder<T> {
 
     private final T value;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/lang/ThreadUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ThreadUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ThreadUtilsJUnitTest.java
index fe318d2..30af492 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ThreadUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ThreadUtilsJUnitTest.java
@@ -178,7 +178,7 @@ public class ThreadUtilsJUnitTest {
     TestFramework.runOnce(new SleepInterruptedMultithreadedTestCase(10 * 1000));
   }
 
-  protected static final class SleepInterruptedMultithreadedTestCase extends MultithreadedTestCase {
+  protected static class SleepInterruptedMultithreadedTestCase extends MultithreadedTestCase {
 
     private final long sleepDuration;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
index f0acc40..7e0859f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
@@ -188,7 +188,7 @@ public class LifecycleListenerJUnitTest {
     assertEquals(2, this.beforeCloseCallbacks.size());
   }
 
-  private static final class LifecycleListenerCallback {
+  private static class LifecycleListenerCallback {
     private final MemoryAllocatorImpl allocator;
     private final long timeStamp;
     private final Throwable creationTime;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
index 3d0e321..1dc6c0d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
@@ -461,8 +461,7 @@ public class AbstractSignalNotificationHandlerJUnitTest {
     // notification verification handled by mockContext.assertIsSatisfied in tearDown()
   }
 
-  private static final class TestSignalNotificationHandler
-      extends AbstractSignalNotificationHandler {
+  private static class TestSignalNotificationHandler extends AbstractSignalNotificationHandler {
   }
 
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
index a88157d..c21bfb8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
@@ -286,7 +286,7 @@ public class IOUtilsJUnitTest {
     }
   }
 
-  private static final class MockFile extends File {
+  private static class MockFile extends File {
 
     private boolean isGetAbsoluteFileCalled = false;
     private boolean isGetCanonicalFileCalled = false;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/LoopHelpers.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/LoopHelpers.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/LoopHelpers.java
index 558c231..c36cbf0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/LoopHelpers.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/LoopHelpers.java
@@ -115,7 +115,7 @@ class LoopHelpers {
     return x;
   }
 
-  public static final class XorShift32Random {
+  public static class XorShift32Random {
     static final AtomicInteger seq = new AtomicInteger(8862213);
     int x = -1831433054;
 
@@ -137,7 +137,7 @@ class LoopHelpers {
 
 
   /** Multiplication-free RNG from Marsaglia "Xorshift RNGs" paper */
-  public static final class MarsagliaRandom {
+  public static class MarsagliaRandom {
     static final AtomicInteger seq = new AtomicInteger(3122688);
     int x;
     int y = 842502087;
@@ -164,7 +164,7 @@ class LoopHelpers {
   /**
    * Unsynchronized version of java.util.Random algorithm.
    */
-  public static final class SimpleRandom {
+  public static class SimpleRandom {
     private final static long multiplier = 0x5DEECE66DL;
     private final static long addend = 0xBL;
     private final static long mask = (1L << 48) - 1;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
index 6b952e0..d6f2579 100644
--- a/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -2114,7 +2114,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
   }
 
   // Simple DistributedMember implementation
-  static final class TestDistributedMember implements DistributedMember {
+  static class TestDistributedMember implements DistributedMember {
 
     private final String host;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
index c2882ca..e430215 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
@@ -262,7 +262,7 @@ public class GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest extends C
     }
   }
 
-  private static final class Peer implements Serializable {
+  private static class Peer implements Serializable {
 
     private final Properties distributedSystemProperties;
     private final VM vm;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/Stock.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/Stock.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/Stock.java
index d3f331d..2ee53b8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/Stock.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/Stock.java
@@ -16,7 +16,7 @@ package org.apache.geode.management.internal.cli.domain;
 
 import java.io.Serializable;
 
-public final class Stock implements Serializable {
+public class Stock implements Serializable {
   private String key;
   private double value;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
index 185ed4c..9a3ce86 100644
--- a/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.test.junit.categories.SecurityTest;
  * @since GemFire 6.1
  */
 @Category({DistributedTest.class, SecurityTest.class})
-public final class DeltaClientAuthorizationDUnitTest extends ClientAuthorizationTestCase {
+public class DeltaClientAuthorizationDUnitTest extends ClientAuthorizationTestCase {
 
   private DeltaTestImpl[] deltas = new DeltaTestImpl[8];
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java b/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java
index f6febb3..2b26cdc 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java
@@ -91,7 +91,7 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
  * @deprecated in favor of just writing a test without this class
  */
 @Deprecated
-public final class SecurityTestUtils {
+public class SecurityTestUtils {
 
   private final JUnit4DistributedTestCase distributedTestCase = new JUnit4DistributedTestCase() {};
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java b/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
index 2cdce2c..13d68b5 100755
--- a/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
@@ -290,7 +290,7 @@ public abstract class AuthzCredentialGenerator {
    *
    * @since GemFire 5.5
    */
-  public static final class ClassCode {
+  public static class ClassCode {
 
     private static byte nextOrdinal = 0;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java b/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
index 885b91f..8695451 100755
--- a/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
@@ -187,7 +187,7 @@ public abstract class CredentialGenerator {
    *
    * @since GemFire 5.5
    */
-  public static final class ClassCode {
+  public static class ClassCode {
 
     private static byte nextOrdinal = 0;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
index 60f47c4..8629749 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
@@ -585,7 +585,7 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase
    * Used to generate a cache.xml. Basically just a {@code CacheCreation} with a few more methods
    * implemented.
    */
-  private static final class TestCacheCreation extends CacheCreation {
+  private static class TestCacheCreation extends CacheCreation {
     private boolean closed = false;
 
     @Override

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqConflatable.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqConflatable.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqConflatable.java
index 652f052..02e865b 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqConflatable.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqConflatable.java
@@ -124,70 +124,70 @@ public class CqConflatable implements Conflatable, Serializable {
   /**
    * @return Returns the conflate.
    */
-  final boolean isConflate() {
+  boolean isConflate() {
     return conflate;
   }
 
   /**
    * @param conflate The conflate to set.
    */
-  final void setConflate(boolean conflate) {
+  void setConflate(boolean conflate) {
     this.conflate = conflate;
   }
 
   /**
    * @return Returns the id.
    */
-  final EventID getId() {
+  EventID getId() {
     return id;
   }
 
   /**
    * @param id The id to set.
    */
-  final void setId(EventID id) {
+  void setId(EventID id) {
     this.id = id;
   }
 
   /**
    * @return Returns the key.
    */
-  final Object getKey() {
+  Object getKey() {
     return key;
   }
 
   /**
    * @param key The key to set.
    */
-  final void setKey(Object key) {
+  void setKey(Object key) {
     this.key = key;
   }
 
   /**
    * @return Returns the regionname.
    */
-  final String getRegionname() {
+  String getRegionname() {
     return regionname;
   }
 
   /**
    * @param regionname The regionname to set.
    */
-  final void setRegionname(String regionname) {
+  void setRegionname(String regionname) {
     this.regionname = regionname;
   }
 
   /**
    * @return Returns the value.
    */
-  final Object getValue() {
+  Object getValue() {
     return value;
   }
 
   /**
    * @param value The value to set.
    */
-  final void setValue(Object value) {
+  void setValue(Object value) {
     this.value = value;
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
index 54cadcb..ea4f128 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
@@ -85,7 +85,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
  *
  * @since GemFire 5.5
  */
-public final class CqServiceImpl implements CqService {
+public class CqServiceImpl implements CqService {
   private static final Logger logger = LogService.getLogger();
 
   private static final Integer MESSAGE_TYPE_LOCAL_CREATE = MessageType.LOCAL_CREATE;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/FileIndexInput.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/FileIndexInput.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/FileIndexInput.java
index 5fe391f..a038526 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/FileIndexInput.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/FileIndexInput.java
@@ -23,7 +23,7 @@ import org.apache.lucene.store.IndexInput;
 import org.apache.geode.cache.lucene.internal.filesystem.File;
 import org.apache.geode.cache.lucene.internal.filesystem.SeekableInputStream;
 
-final class FileIndexInput extends IndexInput {
+class FileIndexInput extends IndexInput {
 
   private final File file;
   SeekableInputStream in;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileInputStream.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileInputStream.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileInputStream.java
index 1d13964..4b7fd75 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileInputStream.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileInputStream.java
@@ -22,7 +22,7 @@ import java.io.IOException;
  * An input stream that reads chunks from a File saved in the region. This input stream will keep
  * going back to the region to look for chunks until nothing is found.
  */
-final class FileInputStream extends SeekableInputStream {
+class FileInputStream extends SeekableInputStream {
 
   private final File file;
   private byte[] chunk = null;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileOutputStream.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileOutputStream.java
index 7eb8623..0c0dbe6 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileOutputStream.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileOutputStream.java
@@ -20,7 +20,7 @@ import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-final class FileOutputStream extends OutputStream {
+class FileOutputStream extends OutputStream {
 
   private final File file;
   private ByteBuffer buffer;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
index 6acd475..c9bfa15 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.Cache;
 import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
 import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
 
-public final class LuceneServiceXmlGenerator implements XmlGenerator<Cache> {
+public class LuceneServiceXmlGenerator implements XmlGenerator<Cache> {
   @Override
   public String getNamspaceUri() {
     return LuceneXmlConstants.NAMESPACE;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
index 2008458..600c819 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
@@ -554,7 +554,7 @@ public class FileSystemJUnitTest {
    * 
    * To use, do this Mockito.mock(Interface, new SpyWrapper(Answer, o)
    */
-  private static final class SpyWrapper implements Answer<Object> {
+  private static class SpyWrapper implements Answer<Object> {
     private final CountOperations countOperations;
     private Object region;
 
@@ -571,7 +571,7 @@ public class FileSystemJUnitTest {
     }
   }
 
-  private static final class CountOperations implements Answer {
+  private static class CountOperations implements Answer {
     public int count;
     private int limit = Integer.MAX_VALUE;
     private Runnable limitAction;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseTestUtils.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseTestUtils.java
index ce91202..5a91fc1 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseTestUtils.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseTestUtils.java
@@ -40,7 +40,7 @@ import org.apache.geode.tools.pulse.tests.PulseTestData;
 import org.apache.geode.tools.pulse.tests.PulseTestLocators;
 import org.apache.geode.tools.pulse.tests.Region;
 
-public final class PulseTestUtils {
+public class PulseTestUtils {
   private static Supplier<WebDriver> driverProvider;
 
   public static void setDriverProvider(Supplier<WebDriver> driverProvider) {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorDiscovery.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorDiscovery.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorDiscovery.java
index 0cfcc37..f5a8fcf 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorDiscovery.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorDiscovery.java
@@ -86,7 +86,7 @@ public class LocatorDiscovery {
   private static final int FAILURE_LOG_MAX_INTERVAL = Integer.getInteger(
       DistributionConfig.GEMFIRE_PREFIX + "LocatorDiscovery.FAILURE_LOG_MAX_INTERVAL", 300000);
 
-  public final boolean skipFailureLogging(DistributionLocatorId locatorId) {
+  public boolean skipFailureLogging(DistributionLocatorId locatorId) {
     boolean skipLogging = false;
     if (this.failureLogInterval.size() < FAILURE_MAP_MAXSIZE) {
       long[] logInterval = this.failureLogInterval.get(locatorId);

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
index d6f997e..2db68c7 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
@@ -45,8 +45,7 @@ public class CustomMappingJackson2HttpMessageConverter extends MappingJackson2Ht
     outputMessageWrapper.flush();
   }
 
-  protected static final class BufferingHttpOutputMessageWrapper
-      implements HttpOutputMessageWrapper {
+  protected static class BufferingHttpOutputMessageWrapper implements HttpOutputMessageWrapper {
 
     private final ByteArrayOutputStream outputStream;
 
@@ -125,7 +124,7 @@ public class CustomMappingJackson2HttpMessageConverter extends MappingJackson2Ht
 
   }
 
-  protected static final class ByteCountingOutputStream extends OutputStream {
+  protected static class ByteCountingOutputStream extends OutputStream {
 
     private AtomicLong byteCount = new AtomicLong(0l);
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
index c61cd6b..4c760e7 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
@@ -134,8 +134,7 @@ public class LoginHandlerInterceptorJUnitTest {
     TestFramework.runOnce(new HandlerInterceptorThreadSafetyMultiThreadedTestCase());
   }
 
-  private final class HandlerInterceptorThreadSafetyMultiThreadedTestCase
-      extends MultithreadedTestCase {
+  private class HandlerInterceptorThreadSafetyMultiThreadedTestCase extends MultithreadedTestCase {
 
     private LoginHandlerInterceptor handlerInterceptor;