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:29:01 UTC

[05/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/internal/cache/partitioned/RemoveIndexesMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
index 17b5f71..4377daa 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
@@ -49,7 +49,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
  * 
  * 
  */
-public final class RemoveIndexesMessage extends PartitionMessage {
+public class RemoveIndexesMessage extends PartitionMessage {
   private static final Logger logger = LogService.getLogger();
 
   /**
@@ -109,7 +109,7 @@ public final class RemoveIndexesMessage extends PartitionMessage {
    * of the initialization
    */
   @Override
-  protected final boolean failIfRegionMissing() {
+  protected boolean failIfRegionMissing() {
     return false;
   }
 
@@ -220,7 +220,7 @@ public final class RemoveIndexesMessage extends PartitionMessage {
   }
 
   @Override
-  public final void fromData(DataInput in) throws IOException, ClassNotFoundException {
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
     super.fromData(in);
     this.removeSingleIndex = in.readBoolean();
     if (this.removeSingleIndex)
@@ -228,7 +228,7 @@ public final class RemoveIndexesMessage extends PartitionMessage {
   }
 
   @Override
-  public final void toData(DataOutput out) throws IOException {
+  public void toData(DataOutput out) throws IOException {
     super.toData(out);
     out.writeBoolean(this.removeSingleIndex);
     if (this.removeSingleIndex)
@@ -239,7 +239,7 @@ public final class RemoveIndexesMessage extends PartitionMessage {
    * Processes remove index on the receiver.
    */
   @Override
-  public final void process(final DistributionManager dm) {
+  public void process(final DistributionManager dm) {
 
     Throwable thr = null;
     boolean sendReply = true;
@@ -413,7 +413,7 @@ public final class RemoveIndexesMessage extends PartitionMessage {
    * index creation.
    *
    */
-  public static final class RemoveIndexesReplyMessage extends ReplyMessage {
+  public static class RemoveIndexesReplyMessage extends ReplyMessage {
 
     /** Indexes removed or not. */
     private boolean result;
@@ -502,7 +502,7 @@ public final class RemoveIndexesMessage extends PartitionMessage {
      * @param dm distribution manager
      */
     @Override
-    public final void process(final DM dm, final ReplyProcessor21 p) {
+    public void process(final DM dm, final ReplyProcessor21 p) {
       RemoveIndexesResponse processor = (RemoveIndexesResponse) p;
       if (processor != null) {
         processor.setResponse(this.result, this.numBucketsIndexesRemoved, this.numTotalBuckets);

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
index 3dc5217..0c6aea8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
@@ -50,7 +50,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
  * 
  * @since GemFire 5.0
  */
-public final class SizeMessage extends PartitionMessage {
+public class SizeMessage extends PartitionMessage {
   private static final Logger logger = LogService.getLogger();
 
   /** The list of buckets whose size is needed, if null, then all buckets */
@@ -206,7 +206,7 @@ public final class SizeMessage extends PartitionMessage {
     DataSerializer.writeArrayList(this.bucketIds, out);
   }
 
-  public static final class SizeReplyMessage extends ReplyMessage {
+  public static class SizeReplyMessage extends ReplyMessage {
     /** Propagated exception from remote node to operation initiator */
     private Map<Integer, SizeEntry> bucketSizes;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BytesAndBits.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BytesAndBits.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BytesAndBits.java
index 5ae3635..281fc93 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BytesAndBits.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BytesAndBits.java
@@ -31,11 +31,11 @@ public class BytesAndBits {
     this.userBits = userBits;
   }
 
-  public final byte[] getBytes() {
+  public byte[] getBytes() {
     return this.data;
   }
 
-  public final byte getBits() {
+  public byte getBits() {
     return this.userBits;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipViewRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipViewRequest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipViewRequest.java
index 2b77483..5efc7db 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipViewRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipViewRequest.java
@@ -91,7 +91,7 @@ public class MembershipViewRequest extends DistributionMessage implements Messag
   }
 
   @Override
-  final public int getProcessorType() {
+  public int getProcessorType() {
     return this.targetReinitializing ? DistributionManager.WAITING_POOL_EXECUTOR
         : DistributionManager.HIGH_PRIORITY_EXECUTOR;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
index 73b8ba9..cfb5fd4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
@@ -394,7 +394,7 @@ public class RegionSnapshotServiceImpl<K, V> implements RegionSnapshotService<K,
    * Writes snapshot data to a {@link SnapshotWriter}. Caller is responsible for invoking
    * {@link SnapshotWriter#snapshotComplete()}.
    */
-  static final class SnapshotWriterSink implements ExportSink {
+  static class SnapshotWriterSink implements ExportSink {
     private final SnapshotWriter writer;
     private long bytes;
 
@@ -419,7 +419,7 @@ public class RegionSnapshotServiceImpl<K, V> implements RegionSnapshotService<K,
    * Forwards snapshot data to a {@link ResultSender}. Caller is responsible for invoking
    * {@link ResultSender#lastResult(Object)}.
    */
-  static final class ResultSenderSink implements ExportSink {
+  static class ResultSenderSink implements ExportSink {
     /** the fowarding destination */
     private final ResultSender<SnapshotRecord[]> sender;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
index 7b291da..504081d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
@@ -58,7 +58,7 @@ import org.apache.geode.management.membership.ClientMembershipListener;
  *
  * @since GemFire 4.2.1
  */
-public final class InternalClientMembership {
+public class InternalClientMembership {
 
   private static final Logger logger = LogService.getLogger();
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
index 58ba4b3..9ed00be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
@@ -147,7 +147,7 @@ public abstract class BaseCommand implements Command {
 
   protected SecurityService securityService = IntegratedSecurityService.getSecurityService();
 
-  final public void execute(Message msg, ServerConnection servConn) {
+  public void execute(Message msg, ServerConnection servConn) {
     // Read the request and update the statistics
     long start = DistributionStats.getStatTime();
     // servConn.resetTransientData();

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java
index 8471252..e866c79 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java
@@ -199,23 +199,23 @@ public class CacheClientNotifierStats {
     }
   }
 
-  public final void incClientRegisterRequests() {
+  public void incClientRegisterRequests() {
     this._stats.incInt(_clientHealthMonitorRegisterId, 1);
   }
 
-  public final int getClientRegisterRequests() {
+  public int getClientRegisterRequests() {
     return this._stats.getInt(_clientHealthMonitorRegisterId);
   }
 
-  public final int get_durableReconnectionCount() {
+  public int get_durableReconnectionCount() {
     return this._stats.getInt(_durableReconnectionCount);
   }
 
-  public final int get_queueDroppedCount() {
+  public int get_queueDroppedCount() {
     return this._stats.getInt(_queueDroppedCount);
   }
 
-  public final int get_eventEnqueuedWhileClientAwayCount() {
+  public int get_eventEnqueuedWhileClientAwayCount() {
     return this._stats.getInt(_eventEnqueuedWhileClientAwayCount);
   }
 
@@ -231,31 +231,31 @@ public class CacheClientNotifierStats {
     return this._stats.getLong(_compiledQueryUsedCount);
   }
 
-  public final void incDurableReconnectionCount() {
+  public void incDurableReconnectionCount() {
     this._stats.incInt(_durableReconnectionCount, 1);
   }
 
-  public final void incQueueDroppedCount() {
+  public void incQueueDroppedCount() {
     this._stats.incInt(_queueDroppedCount, 1);
   }
 
-  public final void incEventEnqueuedWhileClientAwayCount() {
+  public void incEventEnqueuedWhileClientAwayCount() {
     this._stats.incInt(_eventEnqueuedWhileClientAwayCount, 1);
   }
 
-  public final void incClientUnRegisterRequests() {
+  public void incClientUnRegisterRequests() {
     this._stats.incInt(_clientHealthMonitorUnRegisterId, 1);
   }
 
-  public final void incCompiledQueryCount(long count) {
+  public void incCompiledQueryCount(long count) {
     this._stats.incLong(_compiledQueryCount, count);
   }
 
-  public final void incCompiledQueryUsedCount(long count) {
+  public void incCompiledQueryUsedCount(long count) {
     this._stats.incLong(_compiledQueryUsedCount, count);
   }
 
-  public final int getClientUnRegisterRequests() {
+  public int getClientUnRegisterRequests() {
     return this._stats.getInt(_clientHealthMonitorUnRegisterId);
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java
index 8676ea8..f3663c3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java
@@ -367,11 +367,11 @@ public class CacheClientProxyStats implements MessageStats {
     this._stats.incInt(_deltaFullMessagesSentId, 1);
   }
 
-  public final void incReceivedBytes(long v) {
+  public void incReceivedBytes(long v) {
     // noop since we never receive
   }
 
-  public final void incSentBytes(long v) {
+  public void incSentBytes(long v) {
     this._stats.incLong(_sentBytesId, v);
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
index ef3b594..4b6d581 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
  * 
  * @since GemFire 5.0
  */
-public final class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
+public class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
   private static final long serialVersionUID = 2949326125521840437L;
   /**
    * Serialized 2D array of the instantiators

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
index 4e29262..5aedcef 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
@@ -31,7 +31,7 @@ import java.io.*;
  *
  * @since GemFire 5.5
  */
-public final class ClientMarkerMessageImpl implements ClientMessage {
+public class ClientMarkerMessageImpl implements ClientMessage {
   private static final long serialVersionUID = 5423895238521508743L;
 
   /**

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
index 324fcb8..a98214c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
  * 
  * @since GemFire 6.6.2.x
  */
-public final class ClientPingMessageImpl implements ClientMessage {
+public class ClientPingMessageImpl implements ClientMessage {
 
   private static final long serialVersionUID = 5423895238521508743L;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
index 6e119c0..0b11bf1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
@@ -321,7 +321,7 @@ public class HandShake implements ClientHandShake {
     }
   }
 
-  public final Version getClientVersion() {
+  public Version getClientVersion() {
     return this.clientVersion;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
index 8acb558..bfc3937 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
@@ -28,7 +28,7 @@ import java.io.*;
  *
  * @since GemFire 5.7
  */
-public final class InterestResultPolicyImpl extends InterestResultPolicy
+public class InterestResultPolicyImpl extends InterestResultPolicy
     implements DataSerializableFixedID {
   private static final long serialVersionUID = -7456596794818237831L;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
index cf144e5..f102b2d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
@@ -660,7 +660,7 @@ public class Message {
   /**
    * Read the actual bytes of the header off the socket
    */
-  protected final void fetchHeader() throws IOException {
+  protected void fetchHeader() throws IOException {
     final ByteBuffer cb = getCommBuffer();
     cb.clear();
     // msgType is invalidated here and can be used as an indicator

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
index f5ca389..889980f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
@@ -325,7 +325,7 @@ public class Part {
    * Write the contents of this part to the specified byte buffer. Precondition: caller has already
    * checked the length of this part and it will fit into "buf".
    */
-  public final void writeTo(ByteBuffer buf) {
+  public void writeTo(ByteBuffer buf) {
     if (getLength() > 0) {
       if (this.part instanceof byte[]) {
         buf.put((byte[]) this.part);
@@ -356,7 +356,7 @@ public class Part {
    * buffer. This is only called for parts that will not fit into the commBuffer so they need to be
    * written directly to the socket. Precondition: buf contains nothing that needs to be sent
    */
-  public final void writeTo(SocketChannel sc, ByteBuffer buf) throws IOException {
+  public void writeTo(SocketChannel sc, ByteBuffer buf) throws IOException {
     if (getLength() > 0) {
       final int BUF_MAX = buf.capacity();
       if (this.part instanceof byte[]) {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index 6eadee3..83d0e9d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -669,7 +669,7 @@ public class ServerConnection implements Runnable {
     }
   }
 
-  static final class Counter {
+  static class Counter {
     int cnt;
 
     void incr() {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest.java
index ffe2c2c..7453ca8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest.java
@@ -29,7 +29,7 @@ public class UnregisterAllInterest implements Serializable {
   /**
    * Return the only instance of this class.
    */
-  public static final UnregisterAllInterest singleton() {
+  public static UnregisterAllInterest singleton() {
     return SINGLETON;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserverHolder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserverHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserverHolder.java
index 1ef4414..9393c1e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserverHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserverHolder.java
@@ -37,7 +37,7 @@ public class VMotionObserverHolder {
   /**
    * Set the given observer to be notified of events. Returns the current observer.
    */
-  public static final VMotionObserver setInstance(VMotionObserver observer) {
+  public static VMotionObserver setInstance(VMotionObserver observer) {
     Support.assertArg(observer != null, "setInstance expects a non-null argument!");
     VMotionObserver oldObserver = _instance;
     _instance = observer;
@@ -45,7 +45,7 @@ public class VMotionObserverHolder {
   }
 
   /** Return the current VMotionObserver instance */
-  public static final VMotionObserver getInstance() {
+  public static VMotionObserver getInstance() {
     return _instance;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
index fd128c3..0ba40b4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
@@ -701,7 +701,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
     return null;
   }
 
-  final public Set<RegionQueue> getQueuesForConcurrentSerialGatewaySender() {
+  public Set<RegionQueue> getQueuesForConcurrentSerialGatewaySender() {
     if (this.eventProcessor != null
         && (this.eventProcessor instanceof ConcurrentSerialGatewaySenderEventProcessor)) {
       return ((ConcurrentSerialGatewaySenderEventProcessor) this.eventProcessor).getQueues();
@@ -709,7 +709,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
     return null;
   }
 
-  final protected void waitForRunningStatus() {
+  protected void waitForRunningStatus() {
     synchronized (this.eventProcessor.runningStateLock) {
       while (this.eventProcessor.getException() == null && this.eventProcessor.isStopped()) {
         try {
@@ -728,7 +728,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
     }
   }
 
-  final public void pause() {
+  public void pause() {
     if (this.eventProcessor != null) {
       this.getLifeCycleLock().writeLock().lock();
       try {
@@ -750,7 +750,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
     }
   }
 
-  final public void resume() {
+  public void resume() {
     if (this.eventProcessor != null) {
       this.getLifeCycleLock().writeLock().lock();
       try {
@@ -773,21 +773,21 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
     }
   }
 
-  final public boolean isPaused() {
+  public boolean isPaused() {
     if (this.eventProcessor != null) {
       return this.eventProcessor.isPaused();
     }
     return false;
   }
 
-  final public boolean isRunning() {
+  public boolean isRunning() {
     if (this.eventProcessor != null) {
       return !this.eventProcessor.isStopped();
     }
     return false;
   }
 
-  final public AbstractGatewaySenderEventProcessor getEventProcessor() {
+  public AbstractGatewaySenderEventProcessor getEventProcessor() {
     return this.eventProcessor;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
index 478a54e..702438f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
@@ -349,7 +349,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
   protected static final int FAILURE_LOG_MAX_INTERVAL = Integer.getInteger(
       DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.FAILURE_LOG_MAX_INTERVAL", 300000);
 
-  public final boolean skipFailureLogging(Integer batchId) {
+  public boolean skipFailureLogging(Integer batchId) {
     boolean skipLogging = false;
     // if map has become large then give up on new events but we don't expect
     // it to become too large in practise
@@ -387,7 +387,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
    * After a successful batch execution remove from failure map if present (i.e. if the event had
    * failed on a previous try).
    */
-  public final boolean removeEventFromFailureMap(Integer batchId) {
+  public boolean removeEventFromFailureMap(Integer batchId) {
     return this.failureLogInterval.remove(batchId) != null;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
index 9472792..72ad77b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
@@ -488,7 +488,7 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
   /**
    * Profile information for a remote counterpart.
    */
-  public static final class GatewaySenderProfile extends DistributionAdvisor.Profile {
+  public static class GatewaySenderProfile extends DistributionAdvisor.Profile {
     public String Id;
 
     public long startTime;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
index 4a3f398..d944997 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
@@ -41,7 +41,7 @@ import java.util.Set;
  * 
  * @since GemFire 7.0
  */
-public final class GatewaySenderEventCallbackArgument extends WrappedCallbackArgument
+public class GatewaySenderEventCallbackArgument extends WrappedCallbackArgument
     implements DataSerializableFixedID {
   /**
    * The id of the originating <code>GatewayReceiver</code> making the request

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
index 2c3cb67..39f30d6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
@@ -1752,31 +1752,31 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
 
     // Prevent this region from participating in a TX, bug 38709
     @Override
-    final public boolean isSecret() {
+    public boolean isSecret() {
       return true;
     }
 
     // Prevent this region from using concurrency checks
     @Override
-    final public boolean supportsConcurrencyChecks() {
+    public boolean supportsConcurrencyChecks() {
       return false;
     }
 
     @Override
-    final protected boolean shouldNotifyBridgeClients() {
+    protected boolean shouldNotifyBridgeClients() {
       return false;
     }
 
     @Override
-    final public boolean generateEventID() {
+    public boolean generateEventID() {
       return false;
     }
 
-    final public boolean isUsedForParallelGatewaySenderQueue() {
+    public boolean isUsedForParallelGatewaySenderQueue() {
       return true;
     }
 
-    final public AbstractGatewaySender getParallelGatewaySender() {
+    public AbstractGatewaySender getParallelGatewaySender() {
       return this.sender;
     }
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
index 47005c3..cd0ba30 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
@@ -154,7 +154,7 @@ public class ParallelQueueBatchRemovalMessage extends PartitionMessage {
     this.bucketToTailKey = (Map) DataSerializer.readObject(in);
   }
 
-  public static final class BatchRemovalReplyMessage extends ReplyMessage {
+  public static class BatchRemovalReplyMessage extends ReplyMessage {
     /**
      * Empty constructor to conform to DataSerializable interface
      */

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
index 7928662..6fa17a4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
@@ -1171,7 +1171,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
 
     // Prevent this region from using concurrency checks
     @Override
-    final public boolean supportsConcurrencyChecks() {
+    public boolean supportsConcurrencyChecks() {
       return false;
     }
 
@@ -1182,7 +1182,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
 
     // Prevent this region from participating in a TX, bug 38709
     @Override
-    final public boolean isSecret() {
+    public boolean isSecret() {
       return true;
     }
 
@@ -1191,22 +1191,22 @@ public class SerialGatewaySenderQueue implements RegionQueue {
     public void createEventTracker() {}
 
     @Override
-    final protected boolean shouldNotifyBridgeClients() {
+    protected boolean shouldNotifyBridgeClients() {
       return false;
     }
 
     @Override
-    final public boolean generateEventID() {
+    public boolean generateEventID() {
       return false;
     }
 
     @Override
-    final public boolean isUsedForSerialGatewaySenderQueue() {
+    public boolean isUsedForSerialGatewaySenderQueue() {
       return true;
     }
 
     @Override
-    final public AbstractGatewaySender getSerialGatewaySender() {
+    public AbstractGatewaySender getSerialGatewaySender() {
       return sender;
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
index 9816f26..bcf78a9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
@@ -905,7 +905,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @return String value for named attribute or null if attribute not defined.
    * @since GemFire 8.1
    */
-  public static final String getString(final Attributes attributes, final String name) {
+  public static String getString(final Attributes attributes, final String name) {
     return getString(attributes, name, null);
   }
 
@@ -917,7 +917,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @return String value for named attribute or <code>defaultValue</code> if attribute not defined.
    * @since GemFire 8.1
    */
-  public static final String getString(final Attributes attributes, final String name,
+  public static String getString(final Attributes attributes, final String name,
       final String defaultValue) {
     final String value = attributes.getValue(name);
     if (null == value) {
@@ -933,7 +933,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @return Integer value for named attribute or null if attribute not defined.
    * @since GemFire 8.1
    */
-  public static final Integer getInteger(final Attributes attributes, final String name) {
+  public static Integer getInteger(final Attributes attributes, final String name) {
     return getInteger(attributes, name, null);
   }
 
@@ -946,7 +946,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    *         defined.
    * @since GemFire 8.1
    */
-  public static final Integer getInteger(final Attributes attributes, final String name,
+  public static Integer getInteger(final Attributes attributes, final String name,
       final Integer defaultValue) {
     final String value = attributes.getValue(name);
     if (null == value) {
@@ -962,7 +962,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @return Boolean value for named attribute or null if attribute not defined.
    * @since GemFire 8.1
    */
-  public static final Boolean getBoolean(final Attributes attributes, final String name) {
+  public static Boolean getBoolean(final Attributes attributes, final String name) {
     return getBoolean(attributes, name, null);
   }
 
@@ -975,7 +975,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    *         defined.
    * @since GemFire 8.1
    */
-  public static final Boolean getBoolean(final Attributes attributes, final String name,
+  public static Boolean getBoolean(final Attributes attributes, final String name,
       final Boolean defaultValue) {
     final String value = attributes.getValue(name);
     if (null == value) {
@@ -992,7 +992,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @return Enum value for named attribute or null if attribute not defined.
    * @since GemFire 8.1
    */
-  public static final <E extends Enum<E>> E getEnum(final Attributes attributes, final String name,
+  public static <E extends Enum<E>> E getEnum(final Attributes attributes, final String name,
       final Class<E> clazz) {
     return getEnum(attributes, name, clazz, null);
   }
@@ -1006,7 +1006,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @return Enum value for named attribute or <code>defaultValue</code> if attribute not defined.
    * @since GemFire 8.1
    */
-  public static final <E extends Enum<E>> E getEnum(final Attributes attributes, final String name,
+  public static <E extends Enum<E>> E getEnum(final Attributes attributes, final String name,
       final Class<E> clazz, E defaultValue) {
     String value = attributes.getValue(name);
     if (null == value) {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolver.java
index 194b2ec..cdd9659 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolver.java
@@ -32,7 +32,7 @@ import org.xml.sax.ext.EntityResolver2;
  * 
  * @since GemFire 8.1
  */
-public final class GeodeEntityResolver extends DefaultEntityResolver2 {
+public class GeodeEntityResolver extends DefaultEntityResolver2 {
 
   private static final String SYSTEM_ID_ROOT = "http://geode.apache.org/";
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolver.java
index 48ac881..68e43dc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolver.java
@@ -32,7 +32,7 @@ import org.xml.sax.ext.EntityResolver2;
  * 
  * @since GemFire 8.1
  */
-public final class PivotalEntityResolver extends DefaultEntityResolver2 {
+public class PivotalEntityResolver extends DefaultEntityResolver2 {
 
   private static final String SYSTEM_ID_ROOT = "http://schema.pivotal.io/";
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtils.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtils.java
index 3959316..5a4a052 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtils.java
@@ -29,7 +29,7 @@ import org.xml.sax.helpers.AttributesImpl;
  * @since GemFire 8.1
  */
 // UnitTest XmlGeneratorUtilsTest
-public final class XmlGeneratorUtils {
+public class XmlGeneratorUtils {
 
   private XmlGeneratorUtils() {
     // statics only

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/concurrent/AtomicLong5.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/AtomicLong5.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/AtomicLong5.java
index f2d21fd..89ad5ea 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/AtomicLong5.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/AtomicLong5.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.concurrent;
 /**
  * AL implementation for JDK 5.
  */
-public final class AtomicLong5 extends java.util.concurrent.atomic.AtomicLong implements AL {
+public class AtomicLong5 extends java.util.concurrent.atomic.AtomicLong implements AL {
   private static final long serialVersionUID = -1915700199064062938L;
 
   public AtomicLong5() {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
index 1bc4add..9c40f0a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
@@ -338,19 +338,19 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
       this.next = next;
     }
 
-    public final K getKey() {
+    public K getKey() {
       return key;
     }
 
-    public final int hashCode() {
+    public int hashCode() {
       return key.hashCode();
     }
 
-    public final String toString() {
+    public String toString() {
       return key.toString();
     }
 
-    public final boolean equals(Object o) {
+    public boolean equals(Object o) {
       Object k, u;
       Node<?> e;
       return ((o instanceof Node) && ((k = (e = (Node<?>) o)) != null)
@@ -387,14 +387,14 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
    * the highest bits that would otherwise never be used in index calculations because of table
    * bounds.
    */
-  static final int spread(int h) {
+  static int spread(int h) {
     return (h ^ (h >>> 16)) & HASH_BITS;
   }
 
   /**
    * Returns a power of two table size for the given desired capacity. See Hackers Delight, sec 3.2
    */
-  private static final int tableSizeFor(int c) {
+  private static int tableSizeFor(int c) {
     int n = c - 1;
     n |= n >>> 1;
     n |= n >>> 2;
@@ -451,15 +451,15 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
    */
 
   @SuppressWarnings("unchecked")
-  static final <K> Node<K> tabAt(Node<K>[] tab, int i) {
+  static <K> Node<K> tabAt(Node<K>[] tab, int i) {
     return (Node<K>) U.getObjectVolatile(tab, ((long) i << ASHIFT) + ABASE);
   }
 
-  static final <K> boolean casTabAt(Node<K>[] tab, int i, Node<K> c, Node<K> v) {
+  static <K> boolean casTabAt(Node<K>[] tab, int i, Node<K> c, Node<K> v) {
     return U.compareAndSwapObject(tab, ((long) i << ASHIFT) + ABASE, c, v);
   }
 
-  static final <K> void setTabAt(Node<K>[] tab, int i, Node<K> v) {
+  static <K> void setTabAt(Node<K>[] tab, int i, Node<K> v) {
     U.putOrderedObject(tab, ((long) i << ASHIFT) + ABASE, v);
   }
 
@@ -624,7 +624,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
   }
 
   /** Implementation for add */
-  final boolean putKey(V key, boolean onlyIfAbsent) {
+  boolean putKey(V key, boolean onlyIfAbsent) {
     if (key == null)
       throw new NullPointerException();
     int hash = spread(key.hashCode());
@@ -698,7 +698,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
     return removeNode(key);
   }
 
-  final boolean removeNode(Object key) {
+  boolean removeNode(Object key) {
     int hash = spread(key.hashCode());
     for (Node<V>[] tab = table;;) {
       Node<V> f;
@@ -1030,7 +1030,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
   /**
    * A node inserted at head of bins during transfer operations.
    */
-  static final class ForwardingNode<K> extends Node<K> {
+  static class ForwardingNode<K> extends Node<K> {
     final Node<K>[] nextTable;
 
     ForwardingNode(Node<K>[] tab) {
@@ -1060,7 +1060,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
   /**
    * A place-holder node used in computeIfAbsent and compute
    */
-  static final class ReservationNode<K> extends Node<K> {
+  static class ReservationNode<K> extends Node<K> {
     ReservationNode() {
       super(RESERVED, null, null);
     }
@@ -1076,14 +1076,14 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
    * Returns the stamp bits for resizing a table of size n. Must be negative when shifted left by
    * RESIZE_STAMP_SHIFT.
    */
-  static final int resizeStamp(int n) {
+  static int resizeStamp(int n) {
     return Integer.numberOfLeadingZeros(n) | (1 << (RESIZE_STAMP_BITS - 1));
   }
 
   /**
    * Initializes table, using the size recorded in sizeCtl.
    */
-  private final Node<V>[] initTable() {
+  private Node<V>[] initTable() {
     Node<V>[] tab;
     int sc;
     while ((tab = table) == null || tab.length == 0) {
@@ -1115,7 +1115,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
    * @param x the count to add
    * @param check if <0, don't check resize, if <= 1 only check if uncontended
    */
-  private final void addCount(long x, int check) {
+  private void addCount(long x, int check) {
     CounterCell[] as;
     long b, s;
     if ((as = counterCells) != null
@@ -1157,7 +1157,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
   /**
    * Helps transfer if a resize is in progress.
    */
-  final Node<V>[] helpTransfer(Node<V>[] tab, Node<V> f) {
+  Node<V>[] helpTransfer(Node<V>[] tab, Node<V> f) {
     Node<V>[] nextTab;
     int sc;
     if (tab != null && (f instanceof ForwardingNode)
@@ -1182,7 +1182,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
    *
    * @param size number of elements (doesn't need to be perfectly accurate)
    */
-  private final void tryPresize(int size) {
+  private void tryPresize(int size) {
     int c = (size >= (MAXIMUM_CAPACITY >>> 1)) ? MAXIMUM_CAPACITY
         : tableSizeFor(size + (size >>> 1) + 1);
     int sc;
@@ -1223,7 +1223,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
   /**
    * Moves and/or copies the nodes in each bin to new table. See above for explanation.
    */
-  private final void transfer(Node<V>[] tab, Node<V>[] nextTab) {
+  private void transfer(Node<V>[] tab, Node<V>[] nextTab) {
     int n = tab.length, stride;
     if ((stride = (NCPU > 1) ? (n >>> 3) / NCPU : n) < MIN_TRANSFER_STRIDE)
       stride = MIN_TRANSFER_STRIDE; // subdivide range
@@ -1354,7 +1354,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
    * Replaces all linked nodes in bin at given index unless table is too small, in which case
    * resizes instead.
    */
-  private final void treeifyBin(Node<V>[] tab, int index) {
+  private void treeifyBin(Node<V>[] tab, int index) {
     Node<V> b;
     int n, sc;
     if (tab != null) {
@@ -1400,7 +1400,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
   /**
    * Nodes for use in TreeBins
    */
-  static final class TreeNode<K> extends Node<K> {
+  static class TreeNode<K> extends Node<K> {
     TreeNode<K> parent; // red-black tree links
     TreeNode<K> left;
     TreeNode<K> right;
@@ -1419,7 +1419,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
     /**
      * Returns the TreeNode (or null if not found) for the given key starting at given root.
      */
-    final TreeNode<K> findTreeNode(int h, Object k, Class<?> kc) {
+    TreeNode<K> findTreeNode(int h, Object k, Class<?> kc) {
       if (k != null) {
         TreeNode<K> p = this;
         do {
@@ -1459,7 +1459,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
    * forcing writers (who hold bin lock) to wait for readers (who do not) to complete before tree
    * restructuring operations.
    */
-  static final class TreeBin<K> extends Node<K> {
+  static class TreeBin<K> extends Node<K> {
     TreeNode<K> root;
     volatile TreeNode<K> first;
     volatile Thread waiter;
@@ -1530,7 +1530,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
     /**
      * Acquires write lock for tree restructuring.
      */
-    private final void lockRoot() {
+    private void lockRoot() {
       if (!U.compareAndSwapInt(this, LOCKSTATE, 0, WRITER))
         contendedLock(); // offload to separate method
     }
@@ -1538,14 +1538,14 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
     /**
      * Releases write lock for tree restructuring.
      */
-    private final void unlockRoot() {
+    private void unlockRoot() {
       lockState = 0;
     }
 
     /**
      * Possibly blocks awaiting root lock.
      */
-    private final void contendedLock() {
+    private void contendedLock() {
       boolean waiting = false;
       for (int s;;) {
         if (((s = lockState) & ~WAITER) == 0) {
@@ -1568,7 +1568,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
      * Returns matching node or null if none. Tries to search using tree comparisons from root, but
      * continues linear search when lock not available.
      */
-    final Node<K> find(int h, Object k) {
+    Node<K> find(int h, Object k) {
       if (k != null) {
         for (Node<K> e = first; e != null;) {
           int s;
@@ -1607,7 +1607,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
      * 
      * @return null if added
      */
-    final TreeNode<K> putTreeVal(int h, K k) {
+    TreeNode<K> putTreeVal(int h, K k) {
       Class<?> kc = null;
       boolean searched = false;
       for (TreeNode<K> p = root;;) {
@@ -1669,7 +1669,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
      *
      * @return true if now too small, so should be untreeified
      */
-    final boolean removeTreeNode(TreeNode<K> p) {
+    boolean removeTreeNode(TreeNode<K> p) {
       TreeNode<K> next = (TreeNode<K>) p.next;
       TreeNode<K> pred = p.prev; // unlink traversal pointers
       TreeNode<K> r, rl;
@@ -1979,7 +1979,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
    * Records the table, its length, and current traversal index for a traverser that must process a
    * region of a forwarded table before proceeding with current table.
    */
-  static final class TableStack<K> {
+  static class TableStack<K> {
     int length;
     int index;
     Node<K>[] tab;
@@ -2022,7 +2022,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
     /**
      * Advances if possible, returning next valid node, or null if none.
      */
-    final Node<K> advance() {
+    Node<K> advance() {
       Node<K> e;
       if ((e = next) != null)
         e = e.next;
@@ -2103,15 +2103,15 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
       advance();
     }
 
-    public final boolean hasNext() {
+    public boolean hasNext() {
       return next != null;
     }
 
-    public final boolean hasMoreElements() {
+    public boolean hasMoreElements() {
       return next != null;
     }
 
-    public final void remove() {
+    public void remove() {
       Node<K> p;
       if ((p = lastReturned) == null)
         throw new IllegalStateException();
@@ -2120,12 +2120,12 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
     }
   }
 
-  static final class KeyIterator<K> extends BaseIterator<K> implements Iterator<K>, Enumeration<K> {
+  static class KeyIterator<K> extends BaseIterator<K> implements Iterator<K>, Enumeration<K> {
     KeyIterator(Node<K>[] tab, int index, int size, int limit, CompactConcurrentHashSet2<K> map) {
       super(tab, index, size, limit, map);
     }
 
-    public final K next() {
+    public K next() {
       Node<K> p;
       if ((p = next) == null)
         throw new NoSuchElementException();
@@ -2135,7 +2135,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
       return k;
     }
 
-    public final K nextElement() {
+    public K nextElement() {
       return next();
     }
   }
@@ -2147,7 +2147,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
   // See their internal docs for explanation.
 
   // A padded cell for distributing counts
-  static final class CounterCell {
+  static class CounterCell {
     volatile long p0, p1, p2, p3, p4, p5, p6;
     volatile long value;
     volatile long q0, q1, q2, q3, q4, q5, q6;
@@ -2161,7 +2161,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
    * Holder for the thread-local hash code determining which CounterCell to use. The code is
    * initialized via the counterHashCodeGenerator, but may be moved upon collisions.
    */
-  static final class CounterHashCode {
+  static class CounterHashCode {
     int code;
   }
 
@@ -2181,7 +2181,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
   static final ThreadLocal<CounterHashCode> threadCounterHashCode =
       new ThreadLocal<CounterHashCode>();
 
-  final long sumCount() {
+  long sumCount() {
     CounterCell[] as = counterCells;
     CounterCell a;
     long sum = baseCount;
@@ -2195,7 +2195,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
   }
 
   // See LongAdder version for explanation
-  private final void fullAddCount(long x, CounterHashCode hc, boolean wasUncontended) {
+  private void fullAddCount(long x, CounterHashCode hc, boolean wasUncontended) {
     int h;
     if (hc == null) {
       hc = new CounterHashCode();

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/DateFormatter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/DateFormatter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/DateFormatter.java
index 7f53a23..4fa45e6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/DateFormatter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/DateFormatter.java
@@ -22,7 +22,7 @@ import java.util.Date;
  * Defines the common date format for GemFire and provides DateFormat instances.
  * 
  */
-public final class DateFormatter {
+public class DateFormatter {
 
   /**
    * The format string used to format the timestamp of GemFire log messages

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/GemFireHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/GemFireHandler.java b/geode-core/src/main/java/org/apache/geode/internal/logging/GemFireHandler.java
index 324f464..bef89be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/GemFireHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/GemFireHandler.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.logging.log4j.LogWriterLogger;
  * Implementation of the standard JDK handler that publishes a log record to a LogWriterImpl. Note
  * this handler ignores any installed handler.
  */
-public final class GemFireHandler extends Handler {
+public class GemFireHandler extends Handler {
 
   /**
    * Use the log writer to use some of its formatting code.

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/PureLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/PureLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/PureLogWriter.java
index dbb6573..dadf79a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/PureLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/PureLogWriter.java
@@ -252,7 +252,7 @@ public class PureLogWriter extends LogWriterImpl {
     }
   }
 
-  public final void close() {
+  public void close() {
     this.closed = true;
     try {
       if (this.logWriter != null) {
@@ -263,7 +263,7 @@ public class PureLogWriter extends LogWriterImpl {
     }
   }
 
-  public final boolean isClosed() {
+  public boolean isClosed() {
     return this.closed;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogWriter.java
index c95a375..d791835 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogWriter.java
@@ -28,7 +28,7 @@ import org.apache.geode.i18n.StringId;
  * 
  * @since GemFire 5.5
  */
-public final class SecurityLogWriter extends LogWriterImpl implements InternalLogWriter {
+public class SecurityLogWriter extends LogWriterImpl implements InternalLogWriter {
 
   public static final String SECURITY_PREFIX = DistributionConfig.SECURITY_PREFIX_NAME;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityManagerLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityManagerLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityManagerLogWriter.java
index 3e62f7d..d0c6eaa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityManagerLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityManagerLogWriter.java
@@ -29,7 +29,7 @@ import java.io.PrintStream;
  * 
  * @since GemFire 5.5
  */
-public final class SecurityManagerLogWriter extends ManagerLogWriter {
+public class SecurityManagerLogWriter extends ManagerLogWriter {
 
   public SecurityManagerLogWriter(int level, PrintStream stream) {
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertAppender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertAppender.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertAppender.java
index 8a50050..a7151cc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertAppender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertAppender.java
@@ -42,7 +42,7 @@ import org.apache.geode.internal.tcp.ReenteredConnectException;
  * to the log file.
  * 
  */
-public final class AlertAppender extends AbstractAppender implements PropertyChangeListener {
+public class AlertAppender extends AbstractAppender implements PropertyChangeListener {
   private static final String APPENDER_NAME = AlertAppender.class.getName();
   private static final Logger logger = LogService.getLogger();
   private static final AlertAppender instance = createAlertAppender();

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LocalizedMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LocalizedMessage.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LocalizedMessage.java
index 3364759..717ae05 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LocalizedMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LocalizedMessage.java
@@ -23,7 +23,7 @@ import org.apache.geode.i18n.StringId;
  * An implementation of a Log4j {@link Message} that wraps a {@link StringId}.
  * 
  */
-public final class LocalizedMessage implements Message {
+public class LocalizedMessage implements Message {
   private static final long serialVersionUID = -8893339995741536401L;
 
   private final StringId stringId;
@@ -41,19 +41,19 @@ public final class LocalizedMessage implements Message {
     return new LocalizedMessage(stringId, null, null);
   }
 
-  public static final LocalizedMessage create(final StringId stringId, final Object[] params) {
+  public static LocalizedMessage create(final StringId stringId, final Object[] params) {
     return new LocalizedMessage(stringId, params, null);
   }
 
-  public static final LocalizedMessage create(final StringId stringId, final Throwable throwable) {
+  public static LocalizedMessage create(final StringId stringId, final Throwable throwable) {
     return new LocalizedMessage(stringId, null, throwable);
   }
 
-  public static final LocalizedMessage create(final StringId stringId, final Object object) {
+  public static LocalizedMessage create(final StringId stringId, final Object object) {
     return new LocalizedMessage(stringId, new Object[] {object}, null);
   }
 
-  public static final LocalizedMessage create(final StringId stringId, final Object[] params,
+  public static LocalizedMessage create(final StringId stringId, final Object[] params,
       final Throwable throwable) {
     return new LocalizedMessage(stringId, params, throwable);
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppender.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppender.java
index 61cbd45..8559d47 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppender.java
@@ -70,7 +70,7 @@ public class LogWriterAppender extends AbstractAppender implements PropertyChang
    * 
    * @return The new instance.
    */
-  static final LogWriterAppender create(final AppenderContext[] contexts, final String name,
+  static LogWriterAppender create(final AppenderContext[] contexts, final String name,
       final PureLogWriter logWriter, final FileOutputStream fos) {
     LogWriterAppender appender = new LogWriterAppender(contexts, name, logWriter, fos);
     for (AppenderContext context : appender.appenderContexts) {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLogger.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLogger.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLogger.java
index 2a248cc..fad126b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLogger.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLogger.java
@@ -38,7 +38,7 @@ import java.util.logging.Handler;
  * 
  */
 @SuppressWarnings("unused")
-public final class LogWriterLogger extends FastLogger implements InternalLogWriter, GemFireLogger {
+public class LogWriterLogger extends FastLogger implements InternalLogWriter, GemFireLogger {
 
   private static final long serialVersionUID = 446081244292135L;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/ThreadIdPatternConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/ThreadIdPatternConverter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/ThreadIdPatternConverter.java
index 730fc04..338b1d6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/ThreadIdPatternConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/ThreadIdPatternConverter.java
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
  */
 @Plugin(name = "ThreadIdPatternConverter", category = "Converter")
 @ConverterKeys({"tid", "threadId"})
-public final class ThreadIdPatternConverter extends LogEventPatternConverter {
+public class ThreadIdPatternConverter extends LogEventPatternConverter {
   /**
    * Singleton.
    */

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessageFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessageFactory.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessageFactory.java
index 09f2899..f0d40f2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessageFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessageFactory.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.message.ParameterizedMessage;
  * Geode changes include changing class name and package. Additional changes are commented with "//
  * GEODE: note"
  */
-public final class GemFireParameterizedMessageFactory extends AbstractMessageFactory {
+public class GemFireParameterizedMessageFactory extends AbstractMessageFactory {
 
   private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
index 82e36ab..fec81ca 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
@@ -607,7 +607,7 @@ public class SocketCreator {
     return extendedKeyManagers;
   }
 
-  private static final class ExtendedAliasKeyManager extends X509ExtendedKeyManager {
+  private static class ExtendedAliasKeyManager extends X509ExtendedKeyManager {
 
     private final X509ExtendedKeyManager delegate;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java
index 3c9dd72..cd4814b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java
@@ -39,7 +39,7 @@ import org.apache.geode.pdx.internal.PdxType;
  */
 public class DataType implements DSCODE {
 
-  public static final String getDataType(byte[] bytes) {
+  public static String getDataType(byte[] bytes) {
     final DataInput in = getDataInput(bytes);
     byte header = 0;
     try {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
index 670f789..ad9fa09 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
@@ -883,7 +883,7 @@ public class FreeListManager {
   /**
    * Used to represent an address from a tiny free list as a MemoryBlock
    */
-  protected static final class TinyMemoryBlock implements MemoryBlock {
+  protected static class TinyMemoryBlock implements MemoryBlock {
     private final long address;
     private final int freeListId;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/AttachProcessUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/AttachProcessUtils.java b/geode-core/src/main/java/org/apache/geode/internal/process/AttachProcessUtils.java
index b3e9ba6..2103785 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/AttachProcessUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/AttachProcessUtils.java
@@ -23,7 +23,7 @@ import com.sun.tools.attach.VirtualMachineDescriptor;
  * 
  * @since GemFire 8.0
  */
-final class AttachProcessUtils implements InternalProcessUtils {
+class AttachProcessUtils implements InternalProcessUtils {
 
   AttachProcessUtils() {}
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/BlockingProcessStreamReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/BlockingProcessStreamReader.java b/geode-core/src/main/java/org/apache/geode/internal/process/BlockingProcessStreamReader.java
index 7a47b1e..9d2b497 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/BlockingProcessStreamReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/BlockingProcessStreamReader.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.logging.LogService;
  * 
  * @since GemFire 8.2
  */
-public final class BlockingProcessStreamReader extends ProcessStreamReader {
+public class BlockingProcessStreamReader extends ProcessStreamReader {
   private static final Logger logger = LogService.getLogger();
 
   protected BlockingProcessStreamReader(final Builder builder) {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ClusterConfigurationNotAvailableException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ClusterConfigurationNotAvailableException.java b/geode-core/src/main/java/org/apache/geode/internal/process/ClusterConfigurationNotAvailableException.java
index bb4fba2..7699cc4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ClusterConfigurationNotAvailableException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ClusterConfigurationNotAvailableException.java
@@ -20,7 +20,7 @@ package org.apache.geode.internal.process;
  * 
  * @since GemFire 8.0
  */
-public final class ClusterConfigurationNotAvailableException extends RuntimeException {
+public class ClusterConfigurationNotAvailableException extends RuntimeException {
   private static final long serialVersionUID = -3448160213553925462L;
 
   public ClusterConfigurationNotAvailableException(String message) {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ConnectionFailedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ConnectionFailedException.java b/geode-core/src/main/java/org/apache/geode/internal/process/ConnectionFailedException.java
index 7765ef3..0c04130 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ConnectionFailedException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ConnectionFailedException.java
@@ -19,7 +19,7 @@ package org.apache.geode.internal.process;
  * 
  * @since GemFire 7.0
  */
-public final class ConnectionFailedException extends Exception {
+public class ConnectionFailedException extends Exception {
   private static final long serialVersionUID = 5622636452836752700L;
 
   /**

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java b/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
index beae4b4..0af8758 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.logging.LogService;
  * 
  * @since GemFire 8.0
  */
-final class ControlFileWatchdog implements Runnable {
+class ControlFileWatchdog implements Runnable {
   private static final Logger logger = LogService.getLogger();
 
   private static final long STOP_TIMEOUT_MILLIS = 60 * 1000;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java b/geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java
index 288a4f3..7641ed3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.process.ControlFileWatchdog.ControlRequestHandl
  * 
  * @since GemFire 8.0
  */
-public final class ControllableProcess {
+public class ControllableProcess {
   private static final Logger logger = LogService.getLogger();
 
   private final File workingDir;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/FileAlreadyExistsException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/FileAlreadyExistsException.java b/geode-core/src/main/java/org/apache/geode/internal/process/FileAlreadyExistsException.java
index 1bddfeb..4bb6d57 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/FileAlreadyExistsException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/FileAlreadyExistsException.java
@@ -20,7 +20,7 @@ package org.apache.geode.internal.process;
  * 
  * @since GemFire 7.0
  */
-public final class FileAlreadyExistsException extends Exception {
+public class FileAlreadyExistsException extends Exception {
   private static final long serialVersionUID = 5471082555536094256L;
 
   /**

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessController.java b/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessController.java
index efca868..fbea19e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessController.java
@@ -47,7 +47,7 @@ import com.sun.tools.attach.VirtualMachine;
  * @since GemFire 7.0
  * @deprecated as of 8.0 please use {@link ControllableProcess} instead
  */
-public final class LocalProcessController {
+public class LocalProcessController {
 
   /** Property name for the JMX local connector address (from sun.management.Agent) */
   private static final String LOCAL_CONNECTOR_ADDRESS_PROP =

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessLauncher.java b/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessLauncher.java
index 37184fc..04809c2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessLauncher.java
@@ -34,7 +34,7 @@ import java.io.IOException;
  * 
  * @since GemFire 7.0
  */
-public final class LocalProcessLauncher {
+public class LocalProcessLauncher {
 
   public static final String PROPERTY_IGNORE_IS_PID_ALIVE =
       DistributionConfig.GEMFIRE_PREFIX + "test.LocalProcessLauncher.ignoreIsPidAlive";

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/MBeanInvocationFailedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanInvocationFailedException.java b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanInvocationFailedException.java
index f1e499e..724a4d7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanInvocationFailedException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanInvocationFailedException.java
@@ -19,7 +19,7 @@ package org.apache.geode.internal.process;
  * 
  * @since GemFire 7.0
  */
-public final class MBeanInvocationFailedException extends Exception {
+public class MBeanInvocationFailedException extends Exception {
   private static final long serialVersionUID = 7991096466859690801L;
 
   /**

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/MBeanProcessController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanProcessController.java b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanProcessController.java
index 0b7cfd6..ea5946e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanProcessController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanProcessController.java
@@ -42,7 +42,7 @@ import com.sun.tools.attach.VirtualMachine;
  * 
  * @since GemFire 8.0
  */
-public final class MBeanProcessController implements ProcessController {
+public class MBeanProcessController implements ProcessController {
 
   /** Property name for the JMX local connector address (from sun.management.Agent) */
   private static final String LOCAL_CONNECTOR_ADDRESS_PROP =

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/NativeProcessUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/NativeProcessUtils.java b/geode-core/src/main/java/org/apache/geode/internal/process/NativeProcessUtils.java
index 685f39e..34cf81f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/NativeProcessUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/NativeProcessUtils.java
@@ -22,7 +22,7 @@ import org.apache.geode.internal.shared.NativeCalls;
  * 
  * @since GemFire 8.0
  */
-final class NativeProcessUtils implements InternalProcessUtils {
+class NativeProcessUtils implements InternalProcessUtils {
 
   private final static NativeCalls nativeCalls = NativeCalls.getInstance();
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/NonBlockingProcessStreamReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/NonBlockingProcessStreamReader.java b/geode-core/src/main/java/org/apache/geode/internal/process/NonBlockingProcessStreamReader.java
index 202790f..d5c1116 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/NonBlockingProcessStreamReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/NonBlockingProcessStreamReader.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.util.StopWatch;
  * 
  * @since GemFire 8.2
  */
-public final class NonBlockingProcessStreamReader extends ProcessStreamReader {
+public class NonBlockingProcessStreamReader extends ProcessStreamReader {
   private static final Logger logger = LogService.getLogger();
 
   /**

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/PidUnavailableException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/PidUnavailableException.java b/geode-core/src/main/java/org/apache/geode/internal/process/PidUnavailableException.java
index d45ce59..6fa1c9f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/PidUnavailableException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/PidUnavailableException.java
@@ -20,7 +20,7 @@ package org.apache.geode.internal.process;
  * 
  * @since GemFire 7.0
  */
-public final class PidUnavailableException extends Exception {
+public class PidUnavailableException extends Exception {
   private static final long serialVersionUID = -1660269538268828059L;
 
   /**

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerFactory.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerFactory.java
index 9c5c722..38fdcf8 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerFactory.java
@@ -27,7 +27,7 @@ import java.util.concurrent.TimeoutException;
  * 
  * @since GemFire 8.0
  */
-public final class ProcessControllerFactory {
+public class ProcessControllerFactory {
 
   public static final String PROPERTY_DISABLE_ATTACH_API =
       DistributionConfig.GEMFIRE_PREFIX + "test.ProcessControllerFactory.DisableAttachApi";

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ProcessLauncherContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessLauncherContext.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessLauncherContext.java
index 11a4709..463fd18 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessLauncherContext.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessLauncherContext.java
@@ -28,7 +28,7 @@ import java.util.Properties;
  * 
  * @since GemFire 7.0
  */
-public final class ProcessLauncherContext {
+public class ProcessLauncherContext {
 
   public static final String OVERRIDDEN_DEFAULTS_PREFIX =
       DistributionConfig.GEMFIRE_PREFIX + "default.";

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ProcessTerminatedAbnormallyException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessTerminatedAbnormallyException.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessTerminatedAbnormallyException.java
index 53c01f6..510353c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessTerminatedAbnormallyException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessTerminatedAbnormallyException.java
@@ -26,7 +26,7 @@ import org.apache.geode.GemFireException;
  * @see org.apache.geode.GemFireException
  * @since GemFire 7.0
  */
-public final class ProcessTerminatedAbnormallyException extends GemFireException {
+public class ProcessTerminatedAbnormallyException extends GemFireException {
   private static final long serialVersionUID = -1181367425266595492L;
   private final int exitValue;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
index f15489f..3ff74d8 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.util.IOUtils;
  * 
  * @since GemFire 7.0
  */
-public final class ProcessUtils {
+public class ProcessUtils {
 
   private static InternalProcessUtils internal = initializeInternalProcessUtils();