geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [40/78] geode git commit: GEODE-2929: remove final from methods on internal classes
Date Tue, 16 May 2017 02:19:50 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverHolder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverHolder.java
index 888809d..e8241db 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverHolder.java
@@ -40,7 +40,7 @@ public class PartitionedRegionObserverHolder {
   /**
    * Set the given observer to be notified of events. Returns the current observer.
    */
-  public static final PartitionedRegionObserver setInstance(PartitionedRegionObserver observer) {
+  public static PartitionedRegionObserver setInstance(PartitionedRegionObserver observer) {
     Support.assertArg(observer != null, "setInstance expects a non-null argument!");
     PartitionedRegionObserver oldObserver = _instance;
     _instance = observer;
@@ -48,7 +48,7 @@ public class PartitionedRegionObserverHolder {
   }
 
   /** Return the current ClientServerObserver instance */
-  public static final PartitionedRegionObserver getInstance() {
+  public static PartitionedRegionObserver getInstance() {
     return _instance;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
index 25c1d00..b43bfc4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
@@ -437,15 +437,15 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
     return e2;
   }
 
-  public final Object getKey() {
+  public Object getKey() {
     return this.key;
   }
 
-  public final void setKey(Object key) {
+  public void setKey(Object key) {
     this.key = key;
   }
 
-  public final byte[] getValBytes() {
+  public byte[] getValBytes() {
     return this.valBytes;
   }
 
@@ -468,16 +468,16 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
     }
   }
 
-  public final Object getCallbackArg() {
+  public Object getCallbackArg() {
     return this.cbArg;
   }
 
-  protected final Operation getOperation() {
+  protected Operation getOperation() {
     return this.op;
   }
 
   @Override
-  public final void setOperation(Operation operation) {
+  public void setOperation(Operation operation) {
     this.op = operation;
   }
 
@@ -509,7 +509,7 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
   }
 
   @Override
-  public final void fromData(DataInput in) throws IOException, ClassNotFoundException {
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
     super.fromData(in);
 
     final int extraFlags = in.readUnsignedByte();
@@ -567,7 +567,7 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
    * buff.append("; oldvalue object="+this.oldValObj); buff.toString(); return buff.toString(); }
    */
   @Override
-  public final void toData(DataOutput out) throws IOException {
+  public void toData(DataOutput out) throws IOException {
     PartitionedRegion region = null;
     try {
       boolean flag = internalDs.getConfig().getDeltaPropagation();
@@ -675,7 +675,7 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
    * indefinitely for the acknowledgement
    */
   @Override
-  protected final boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion r,
+  protected boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion r,
       long startTime) throws EntryExistsException, DataLocationException, IOException {
     this.setInternalDs(r.getSystem());// set the internal DS. Required to
                                       // checked DS level delta-enabled property
@@ -823,7 +823,7 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
 
 
   @Override
-  protected final void appendFields(StringBuilder buff) {
+  protected void appendFields(StringBuilder buff) {
     super.appendFields(buff);
     buff.append("; key=").append(getKey()).append("; value=");
     // buff.append(getValBytes());
@@ -864,11 +864,11 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
     }
   }
 
-  public final InternalDistributedSystem getInternalDs() {
+  public InternalDistributedSystem getInternalDs() {
     return internalDs;
   }
 
-  public final void setInternalDs(InternalDistributedSystem internalDs) {
+  public void setInternalDs(InternalDistributedSystem internalDs) {
     this.internalDs = internalDs;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
index dc3efff..c473d2d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
@@ -568,7 +568,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
     }
 
     @Override
-    protected final int getIntInfo() {
+    protected int getIntInfo() {
       int s = super.getIntInfo();
       if (this.requiresNotification)
         s |= REQUIRES_NOTIFICATION_MASK;
@@ -576,7 +576,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
     }
 
     @Override
-    protected final void setIntInfo(int s) {
+    protected void setIntInfo(int s) {
       super.setIntInfo(s);
       this.requiresNotification = (s & REQUIRES_NOTIFICATION_MASK) != 0;
     }
@@ -598,7 +598,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
       out.writeInt(this.shutDownAllStatus);
     }
 
-    // public final StoppableReentrantReadWriteLock.StoppableReadLock
+    // public StoppableReentrantReadWriteLock.StoppableReadLock
     // getIsClosingReadLock(CancelCriterion stopper) {
     // synchronized (this) {
     // if (isClosingLock == null) {
@@ -608,7 +608,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
     // return this.isClosingLock.readLock();
     // }
 
-    // public final Lock getIsClosingWriteLock() {
+    // public Lock getIsClosingWriteLock() {
     // return this.isClosingLock.writeLock();
     // }
 
@@ -1055,7 +1055,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
   }
 
   @Override
-  final synchronized public boolean putProfile(Profile p) {
+  synchronized public boolean putProfile(Profile p) {
     assert p instanceof CacheProfile;
     CacheProfile profile = (CacheProfile) p;
     PartitionedRegion pr = getPartitionedRegion();
@@ -1072,7 +1072,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
     return super.putProfile(profile);
   }
 
-  final public PartitionProfile getPartitionProfile(InternalDistributedMember id) {
+  public PartitionProfile getPartitionProfile(InternalDistributedMember id) {
     return (PartitionProfile) getProfile(id);
   }
 
@@ -1209,7 +1209,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
    * @param bucketId
    * @return the Node managing the primary copy of the bucket
    */
-  final public InternalDistributedMember getPrimaryMemberForBucket(int bucketId) {
+  public InternalDistributedMember getPrimaryMemberForBucket(int bucketId) {
     Assert.assertTrue(this.buckets != null);
     Bucket b = this.buckets[bucketId];
     return b.getBucketAdvisor().getPrimary();

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteSizeMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteSizeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteSizeMessage.java
index 5595cb2..fd0ebd4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteSizeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteSizeMessage.java
@@ -120,7 +120,7 @@ public class RemoteSizeMessage extends RemoteOperationMessage {
    * of the initialization
    */
   @Override
-  protected final boolean failIfRegionMissing() {
+  protected boolean failIfRegionMissing() {
     return false;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
index 4ef4157..7ee54d8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
@@ -307,7 +307,7 @@ public class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
    * indefinitely for the acknowledgement
    */
   @Override
-  protected final boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion r,
+  protected boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion r,
       long startTime) throws EntryExistsException, ForceReattemptException, DataLocationException {
     boolean sendReply = true;
 
@@ -358,7 +358,7 @@ public class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
    * @return If succeeds, return true, otherwise, throw exception
    */
   @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "IMSE_DONT_CATCH_IMSE")
-  public final boolean doLocalRemoveAll(PartitionedRegion r, InternalDistributedMember eventSender,
+  public boolean doLocalRemoveAll(PartitionedRegion r, InternalDistributedMember eventSender,
       boolean cacheWrite)
       throws EntryExistsException, ForceReattemptException, DataLocationException {
     boolean didRemove = false;
@@ -647,15 +647,15 @@ public class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
     }
   }
 
-  public final InternalDistributedSystem getInternalDs() {
+  public InternalDistributedSystem getInternalDs() {
     return internalDs;
   }
 
-  public final void setInternalDs(InternalDistributedSystem internalDs) {
+  public void setInternalDs(InternalDistributedSystem internalDs) {
     this.internalDs = internalDs;
   }
 
-  public final void setDirectAck(boolean directAck) {
+  public void setDirectAck(boolean directAck) {
     this.directAck = directAck;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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 5aff6da..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
@@ -109,7 +109,7 @@ public class RemoveIndexesMessage extends PartitionMessage {
    * of the initialization
    */
   @Override
-  protected final boolean failIfRegionMissing() {
+  protected boolean failIfRegionMissing() {
     return false;
   }
 
@@ -220,7 +220,7 @@ public 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 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 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;
@@ -502,7 +502,7 @@ public 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/5abc4863/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/5abc4863/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/5abc4863/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/5abc4863/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/5abc4863/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/5abc4863/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/5abc4863/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/5abc4863/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/5abc4863/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/5abc4863/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/5abc4863/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/5abc4863/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/5abc4863/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/5abc4863/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..67f38f9 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,12 +1191,12 @@ 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;
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/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/5abc4863/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 d184f98..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;
@@ -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) {
@@ -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 {
@@ -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;
@@ -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();
@@ -2125,7 +2125,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
       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();
     }
   }
@@ -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/5abc4863/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/5abc4863/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 870ca4f..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
@@ -41,19 +41,19 @@ public 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/5abc4863/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/5abc4863/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/5abc4863/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java
index 86064e4..238abcf 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java
@@ -81,7 +81,7 @@ public abstract class NativeCalls {
   }
 
   @SuppressWarnings("unchecked")
-  protected static final Map<String, String> getModifiableJavaEnv() {
+  protected static Map<String, String> getModifiableJavaEnv() {
     final Map<String, String> env = System.getenv();
     try {
       final Field m = env.getClass().getDeclaredField("m");
@@ -93,7 +93,7 @@ public abstract class NativeCalls {
   }
 
   @SuppressWarnings("unchecked")
-  protected static final Map<String, String> getModifiableJavaEnvWIN() {
+  protected static Map<String, String> getModifiableJavaEnvWIN() {
     try {
       final Field envField = Class.forName("java.lang.ProcessEnvironment")
           .getDeclaredField("theCaseInsensitiveEnvironment");
@@ -355,7 +355,7 @@ public abstract class NativeCalls {
    * A generic implementation of {@link #setSocketOptions} for POSIX like systems that requires the
    * child classes to implement a few platform specific methods.
    */
-  protected final Map<TCPSocketOptions, Throwable> setGenericSocketOptions(Socket sock,
+  protected Map<TCPSocketOptions, Throwable> setGenericSocketOptions(Socket sock,
       InputStream sockStream, Map<TCPSocketOptions, Object> optValueMap)
       throws UnsupportedOperationException {
     final Set<Map.Entry<TCPSocketOptions, Object>> optValueEntries = optValueMap.entrySet();

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
index 3efb62b..760144a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
@@ -69,7 +69,7 @@ public class NativeCallsJNAImpl {
    */
   private static final NativeCalls instance = getImplInstance();
 
-  private static final NativeCalls getImplInstance() {
+  private static NativeCalls getImplInstance() {
     if (Platform.isLinux()) {
       return new LinuxNativeCalls();
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/shared/NativeErrorException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeErrorException.java b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeErrorException.java
index 63001f3..2a2193b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeErrorException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeErrorException.java
@@ -33,7 +33,7 @@ public class NativeErrorException extends Exception {
     this.errorCode = errorCode;
   }
 
-  public final int getErrorCode() {
+  public int getErrorCode() {
     return this.errorCode;
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/shared/OSType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/OSType.java b/geode-core/src/main/java/org/apache/geode/internal/shared/OSType.java
index afbf630..a401981 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/OSType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/OSType.java
@@ -76,7 +76,7 @@ public enum OSType {
   /**
    * Indicates a Microsoft Windows family OS.
    */
-  public final boolean isWindows() {
+  public boolean isWindows() {
     return this == WIN;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/statistics/AbstractStatisticsFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/AbstractStatisticsFactory.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/AbstractStatisticsFactory.java
index 90d141e..7a9fe8e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/AbstractStatisticsFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/AbstractStatisticsFactory.java
@@ -59,32 +59,32 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
   public void close() {}
 
   @Override
-  public final String getName() {
+  public String getName() {
     return this.name;
   }
 
   @Override
-  public final long getId() {
+  public long getId() {
     return this.id;
   }
 
   @Override
-  public final long getStartTime() {
+  public long getStartTime() {
     return this.startTime;
   }
 
   @Override
-  public final int getStatListModCount() {
+  public int getStatListModCount() {
     return this.statsListModCount;
   }
 
   @Override
-  public final List<Statistics> getStatsList() {
+  public List<Statistics> getStatsList() {
     return this.statsList;
   }
 
   @Override
-  public final int getStatisticsCount() {
+  public int getStatisticsCount() {
     int result = 0;
     List<Statistics> statsList = this.statsList;
     if (statsList != null) {
@@ -94,7 +94,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
   }
 
   @Override
-  public final Statistics findStatistics(long id) {
+  public Statistics findStatistics(long id) {
     List<Statistics> statsList = this.statsList;
     synchronized (statsList) {
       for (Statistics s : statsList) {
@@ -108,7 +108,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
   }
 
   @Override
-  public final boolean statisticsExists(long id) {
+  public boolean statisticsExists(long id) {
     List<Statistics> statsList = this.statsList;
     for (Statistics s : statsList) {
       if (s.getUniqueId() == id) {
@@ -119,7 +119,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
   }
 
   @Override
-  public final Statistics[] getStatistics() {
+  public Statistics[] getStatistics() {
     List<Statistics> statsList = this.statsList;
     return (Statistics[]) statsList.toArray(new Statistics[statsList.size()]);
   }
@@ -127,17 +127,17 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
   // StatisticsFactory methods
 
   @Override
-  public final Statistics createStatistics(StatisticsType type) {
+  public Statistics createStatistics(StatisticsType type) {
     return createOsStatistics(type, null, 0, 0);
   }
 
   @Override
-  public final Statistics createStatistics(StatisticsType type, String textId) {
+  public Statistics createStatistics(StatisticsType type, String textId) {
     return createOsStatistics(type, textId, 0, 0);
   }
 
   @Override
-  public final Statistics createStatistics(StatisticsType type, String textId, long numericId) {
+  public Statistics createStatistics(StatisticsType type, String textId, long numericId) {
     return createOsStatistics(type, textId, 0, 0);
   }
 
@@ -157,7 +157,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
   }
 
   @Override
-  public final Statistics[] findStatisticsByType(StatisticsType type) {
+  public Statistics[] findStatisticsByType(StatisticsType type) {
     List<Statistics> hits = new ArrayList<Statistics>();
     Iterator<Statistics> it = statsList.iterator();
     while (it.hasNext()) {
@@ -171,7 +171,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
   }
 
   @Override
-  public final Statistics[] findStatisticsByTextId(String textId) {
+  public Statistics[] findStatisticsByTextId(String textId) {
     List<Statistics> hits = new ArrayList<Statistics>();
     Iterator<Statistics> it = statsList.iterator();
     while (it.hasNext()) {
@@ -185,7 +185,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
   }
 
   @Override
-  public final Statistics[] findStatisticsByNumericId(long numericId) {
+  public Statistics[] findStatisticsByNumericId(long numericId) {
     List<Statistics> hits = new ArrayList<Statistics>();
     Iterator<Statistics> it = statsList.iterator();
     while (it.hasNext()) {
@@ -198,7 +198,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
     return (Statistics[]) hits.toArray(result);
   }
 
-  public final Statistics findStatisticsByUniqueId(long uniqueId) {
+  public Statistics findStatisticsByUniqueId(long uniqueId) {
     Iterator<Statistics> it = statsList.iterator();
     while (it.hasNext()) {
       Statistics s = (Statistics) it.next();
@@ -211,7 +211,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
 
   /** for internal use only. Its called by {@link LocalStatisticsImpl#close}. */
   @Override
-  public final void destroyStatistics(Statistics stats) {
+  public void destroyStatistics(Statistics stats) {
     synchronized (statsList) {
       if (statsList.remove(stats)) {
         statsListModCount++;
@@ -220,12 +220,12 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
   }
 
   @Override
-  public final Statistics createAtomicStatistics(StatisticsType type) {
+  public Statistics createAtomicStatistics(StatisticsType type) {
     return createAtomicStatistics(type, null, 0);
   }
 
   @Override
-  public final Statistics createAtomicStatistics(StatisticsType type, String textId) {
+  public Statistics createAtomicStatistics(StatisticsType type, String textId) {
     return createAtomicStatistics(type, textId, 0);
   }
 
@@ -249,86 +249,86 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
    * Creates or finds a StatisticType for the given shared class.
    */
   @Override
-  public final StatisticsType createType(String name, String description,
+  public StatisticsType createType(String name, String description,
       StatisticDescriptor[] stats) {
     return tf.createType(name, description, stats);
   }
 
   @Override
-  public final StatisticsType findType(String name) {
+  public StatisticsType findType(String name) {
     return tf.findType(name);
   }
 
   @Override
-  public final StatisticsType[] createTypesFromXml(Reader reader) throws IOException {
+  public StatisticsType[] createTypesFromXml(Reader reader) throws IOException {
     return tf.createTypesFromXml(reader);
   }
 
   @Override
-  public final StatisticDescriptor createIntCounter(String name, String description, String units) {
+  public StatisticDescriptor createIntCounter(String name, String description, String units) {
     return tf.createIntCounter(name, description, units);
   }
 
   @Override
-  public final StatisticDescriptor createLongCounter(String name, String description,
+  public StatisticDescriptor createLongCounter(String name, String description,
       String units) {
     return tf.createLongCounter(name, description, units);
   }
 
   @Override
-  public final StatisticDescriptor createDoubleCounter(String name, String description,
+  public StatisticDescriptor createDoubleCounter(String name, String description,
       String units) {
     return tf.createDoubleCounter(name, description, units);
   }
 
   @Override
-  public final StatisticDescriptor createIntGauge(String name, String description, String units) {
+  public StatisticDescriptor createIntGauge(String name, String description, String units) {
     return tf.createIntGauge(name, description, units);
   }
 
   @Override
-  public final StatisticDescriptor createLongGauge(String name, String description, String units) {
+  public StatisticDescriptor createLongGauge(String name, String description, String units) {
     return tf.createLongGauge(name, description, units);
   }
 
   @Override
-  public final StatisticDescriptor createDoubleGauge(String name, String description,
+  public StatisticDescriptor createDoubleGauge(String name, String description,
       String units) {
     return tf.createDoubleGauge(name, description, units);
   }
 
   @Override
-  public final StatisticDescriptor createIntCounter(String name, String description, String units,
+  public StatisticDescriptor createIntCounter(String name, String description, String units,
       boolean largerBetter) {
     return tf.createIntCounter(name, description, units, largerBetter);
   }
 
   @Override
-  public final StatisticDescriptor createLongCounter(String name, String description, String units,
+  public StatisticDescriptor createLongCounter(String name, String description, String units,
       boolean largerBetter) {
     return tf.createLongCounter(name, description, units, largerBetter);
   }
 
   @Override
-  public final StatisticDescriptor createDoubleCounter(String name, String description,
+  public StatisticDescriptor createDoubleCounter(String name, String description,
       String units, boolean largerBetter) {
     return tf.createDoubleCounter(name, description, units, largerBetter);
   }
 
   @Override
-  public final StatisticDescriptor createIntGauge(String name, String description, String units,
+  public StatisticDescriptor createIntGauge(String name, String description, String units,
       boolean largerBetter) {
     return tf.createIntGauge(name, description, units, largerBetter);
   }
 
   @Override
-  public final StatisticDescriptor createLongGauge(String name, String description, String units,
+  public StatisticDescriptor createLongGauge(String name, String description, String units,
       boolean largerBetter) {
     return tf.createLongGauge(name, description, units, largerBetter);
   }
 
   @Override
-  public final StatisticDescriptor createDoubleGauge(String name, String description, String units,
+  public StatisticDescriptor createDoubleGauge(String name, String description, String units,
       boolean largerBetter) {
     return tf.createDoubleGauge(name, description, units, largerBetter);
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsImpl.java
index 120bf54..ed38f21 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsImpl.java
@@ -49,137 +49,137 @@ public class DummyStatisticsImpl implements Statistics {
     this.numericId = numericId;
   }
 
-  public final void close() {}
+  public void close() {}
 
   //////////////////////// accessor Methods ///////////////////////
 
-  public final int nameToId(String name) {
+  public int nameToId(String name) {
     return this.type.nameToId(name);
   }
 
-  public final StatisticDescriptor nameToDescriptor(String name) {
+  public StatisticDescriptor nameToDescriptor(String name) {
     return this.type.nameToDescriptor(name);
   }
 
-  public final long getUniqueId() {
+  public long getUniqueId() {
     return 0;
   }
 
-  public final StatisticsType getType() {
+  public StatisticsType getType() {
     return this.type;
   }
 
-  public final String getTextId() {
+  public String getTextId() {
     return this.textId;
   }
 
-  public final long getNumericId() {
+  public long getNumericId() {
     return this.numericId;
   }
 
-  public final boolean isAtomic() {
+  public boolean isAtomic() {
     return true;
   }
 
-  public final boolean isClosed() {
+  public boolean isClosed() {
     return false;
   }
 
   //////////////////////// set() Methods ///////////////////////
 
-  public final void setInt(int id, int value) {}
+  public void setInt(int id, int value) {}
 
-  public final void setInt(StatisticDescriptor descriptor, int value) {}
+  public void setInt(StatisticDescriptor descriptor, int value) {}
 
-  public final void setInt(String name, int value) {}
+  public void setInt(String name, int value) {}
 
-  public final void setLong(int id, long value) {}
+  public void setLong(int id, long value) {}
 
-  public final void setLong(StatisticDescriptor descriptor, long value) {}
+  public void setLong(StatisticDescriptor descriptor, long value) {}
 
-  public final void setLong(String name, long value) {}
+  public void setLong(String name, long value) {}
 
-  public final void setDouble(int id, double value) {}
+  public void setDouble(int id, double value) {}
 
-  public final void setDouble(StatisticDescriptor descriptor, double value) {}
+  public void setDouble(StatisticDescriptor descriptor, double value) {}
 
-  public final void setDouble(String name, double value) {}
+  public void setDouble(String name, double value) {}
 
   /////////////////////// get() Methods ///////////////////////
 
-  public final int getInt(int id) {
+  public int getInt(int id) {
     return 0;
   }
 
-  public final int getInt(StatisticDescriptor descriptor) {
+  public int getInt(StatisticDescriptor descriptor) {
     return 0;
   }
 
-  public final int getInt(String name) {
+  public int getInt(String name) {
     return 0;
   }
 
-  public final long getLong(int id) {
+  public long getLong(int id) {
     return 0;
   }
 
-  public final long getLong(StatisticDescriptor descriptor) {
+  public long getLong(StatisticDescriptor descriptor) {
     return 0;
   }
 
-  public final long getLong(String name) {
+  public long getLong(String name) {
     return 0;
   }
 
-  public final double getDouble(int id) {
+  public double getDouble(int id) {
     return 0.0;
   }
 
-  public final double getDouble(StatisticDescriptor descriptor) {
+  public double getDouble(StatisticDescriptor descriptor) {
     return 0.0;
   }
 
-  public final double getDouble(String name) {
+  public double getDouble(String name) {
     return 0.0;
   }
 
   private static final Number dummyNumber = Integer.valueOf(0);
 
-  public final Number get(StatisticDescriptor descriptor) {
+  public Number get(StatisticDescriptor descriptor) {
     return dummyNumber;
   }
 
-  public final Number get(String name) {
+  public Number get(String name) {
     return dummyNumber;
   }
 
-  public final long getRawBits(StatisticDescriptor descriptor) {
+  public long getRawBits(StatisticDescriptor descriptor) {
     return 0;
   }
 
-  public final long getRawBits(String name) {
+  public long getRawBits(String name) {
     return 0;
   }
 
   //////////////////////// inc() Methods ////////////////////////
 
-  public final void incInt(int id, int delta) {}
+  public void incInt(int id, int delta) {}
 
-  public final void incInt(StatisticDescriptor descriptor, int delta) {}
+  public void incInt(StatisticDescriptor descriptor, int delta) {}
 
-  public final void incInt(String name, int delta) {}
+  public void incInt(String name, int delta) {}
 
-  public final void incLong(int id, long delta) {}
+  public void incLong(int id, long delta) {}
 
-  public final void incLong(StatisticDescriptor descriptor, long delta) {}
+  public void incLong(StatisticDescriptor descriptor, long delta) {}
 
-  public final void incLong(String name, long delta) {}
+  public void incLong(String name, long delta) {}
 
-  public final void incDouble(int id, double delta) {}
+  public void incDouble(int id, double delta) {}
 
-  public final void incDouble(StatisticDescriptor descriptor, double delta) {}
+  public void incDouble(StatisticDescriptor descriptor, double delta) {}
 
-  public final void incDouble(String name, double delta) {}
+  public void incDouble(String name, double delta) {}
 
   @Override
   public IntSupplier setIntSupplier(final int id, final IntSupplier supplier) {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/statistics/GemFireStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/GemFireStatSampler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/GemFireStatSampler.java
index f264238..1bc6b8a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/GemFireStatSampler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/GemFireStatSampler.java
@@ -78,7 +78,7 @@ public class GemFireStatSampler extends HostStatSampler {
    *
    * @since GemFire 3.5
    */
-  public final ProcessStats getProcessStats() {
+  public ProcessStats getProcessStats() {
     return this.processStats;
   }
 
@@ -157,12 +157,12 @@ public class GemFireStatSampler extends HostStatSampler {
   }
 
   @Override
-  public final File getArchiveFileName() {
+  public File getArchiveFileName() {
     return this.con.getConfig().getStatisticArchiveFile();
   }
 
   @Override
-  public final long getArchiveFileSizeLimit() {
+  public long getArchiveFileSizeLimit() {
     if (fileSizeLimitInKB()) {
       // use KB instead of MB to speed up rolling for testing
       return ((long) this.con.getConfig().getArchiveFileSizeLimit()) * (1024);
@@ -172,7 +172,7 @@ public class GemFireStatSampler extends HostStatSampler {
   }
 
   @Override
-  public final long getArchiveDiskSpaceLimit() {
+  public long getArchiveDiskSpaceLimit() {
     if (fileSizeLimitInKB()) {
       // use KB instead of MB to speed up removal for testing
       return ((long) this.con.getConfig().getArchiveDiskSpaceLimit()) * (1024);
@@ -216,27 +216,27 @@ public class GemFireStatSampler extends HostStatSampler {
   }
 
   @Override
-  protected final int getSampleRate() {
+  protected int getSampleRate() {
     return this.con.getConfig().getStatisticSampleRate();
   }
 
   @Override
-  public final boolean isSamplingEnabled() {
+  public boolean isSamplingEnabled() {
     return this.con.getConfig().getStatisticSamplingEnabled();
   }
 
   @Override
-  protected final StatisticsManager getStatisticsManager() {
+  protected StatisticsManager getStatisticsManager() {
     return this.con;
   }
 
   @Override
-  protected final OsStatisticsFactory getOsStatisticsFactory() {
+  protected OsStatisticsFactory getOsStatisticsFactory() {
     return this.con;
   }
 
   @Override
-  protected final long getSpecialStatsId() {
+  protected long getSpecialStatsId() {
     long statId = OSProcess.getId();
     if (statId == 0 || statId == -1) {
       statId = getStatisticsManager().getId();
@@ -245,7 +245,7 @@ public class GemFireStatSampler extends HostStatSampler {
   }
 
   @Override
-  protected final void initProcessStats(long id) {
+  protected void initProcessStats(long id) {
     if (PureJavaMode.osStatsAreAvailable()) {
       if (osStatsDisabled()) {
         logger.info(LogMarker.STATISTICS, LocalizedMessage.create(
@@ -269,7 +269,7 @@ public class GemFireStatSampler extends HostStatSampler {
   }
 
   @Override
-  protected final void sampleProcessStats(boolean prepareOnly) {
+  protected void sampleProcessStats(boolean prepareOnly) {
     if (prepareOnly || osStatsDisabled() || !PureJavaMode.osStatsAreAvailable()) {
       return;
     }
@@ -292,7 +292,7 @@ public class GemFireStatSampler extends HostStatSampler {
   }
 
   @Override
-  protected final void closeProcessStats() {
+  protected void closeProcessStats() {
     if (PureJavaMode.osStatsAreAvailable()) {
       if (!osStatsDisabled()) {
         if (this.processStats != null) {
@@ -415,12 +415,12 @@ public class GemFireStatSampler extends HostStatSampler {
     private InternalDistributedMember recipient;
 
     @Override
-    public final int hashCode() {
+    public int hashCode() {
       return listenerId;
     }
 
     @Override
-    public final boolean equals(Object o) {
+    public boolean equals(Object o) {
       if (o == null) {
         return false;
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
index c3ed946..928956e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
@@ -106,7 +106,7 @@ public abstract class HostStatSampler
     this.timer = timer;
   }
 
-  public final StatSamplerStats getStatSamplerStats() {
+  public StatSamplerStats getStatSamplerStats() {
     return this.samplerStats;
   }
 
@@ -114,7 +114,7 @@ public abstract class HostStatSampler
    * Returns the number of times a statistics resource has been add or deleted.
    */
   @Override
-  public final int getStatisticsModCount() {
+  public int getStatisticsModCount() {
     return getStatisticsManager().getStatListModCount();
   }
 
@@ -122,7 +122,7 @@ public abstract class HostStatSampler
    * Returns an array of all the current statistic resource instances.
    */
   @Override
-  public final Statistics[] getStatistics() {
+  public Statistics[] getStatistics() {
     return getStatisticsManager().getStatistics();
   }
 
@@ -130,7 +130,7 @@ public abstract class HostStatSampler
    * Returns a unique id for the sampler's system.
    */
   @Override
-  public final long getSystemId() {
+  public long getSystemId() {
     return getStatisticsManager().getId();
   }
 
@@ -138,7 +138,7 @@ public abstract class HostStatSampler
    * Returns the time this sampler's system was started.
    */
   @Override
-  public final long getSystemStartTime() {
+  public long getSystemStartTime() {
     return getStatisticsManager().getStartTime();
   }
 
@@ -146,7 +146,7 @@ public abstract class HostStatSampler
    * Returns the path to this sampler's system directory; if it has one.
    */
   @Override
-  public final String getSystemDirectoryPath() {
+  public String getSystemDirectoryPath() {
     try {
       return SocketCreator.getHostName(SocketCreator.getLocalHost());
     } catch (UnknownHostException ignore) {
@@ -179,7 +179,7 @@ public abstract class HostStatSampler
    * This service's main loop
    */
   @Override
-  public final void run() {
+  public void run() {
     final boolean isDebugEnabled_STATISTICS = logger.isTraceEnabled(LogMarker.STATISTICS);
     if (isDebugEnabled_STATISTICS) {
       logger.trace(LogMarker.STATISTICS, "HostStatSampler started");
@@ -275,7 +275,7 @@ public abstract class HostStatSampler
    * @throws IllegalStateException if an instance of the {@link #statThread} is still running from a
    *         previous DistributedSystem.
    */
-  public final void start() {
+  public void start() {
     synchronized (HostStatSampler.class) {
       if (statThread != null) {
         try {
@@ -311,11 +311,11 @@ public abstract class HostStatSampler
   /**
    * Tell this service's main thread to terminate.
    */
-  public final void stop() {
+  public void stop() {
     stop(true);
   }
 
-  private final void stop(boolean interruptIfAlive) {
+  private void stop(boolean interruptIfAlive) {
     synchronized (HostStatSampler.class) {
       this.callbackSampler.stop();
       if (statThread == null) {
@@ -354,7 +354,7 @@ public abstract class HostStatSampler
     }
   }
 
-  public final boolean isAlive() {
+  public boolean isAlive() {
     synchronized (HostStatSampler.class) {
       return statThread != null && statThread.isAlive();
     }
@@ -367,7 +367,7 @@ public abstract class HostStatSampler
    * @see #initSpecialStats
    * @since GemFire 3.5
    */
-  public final void waitForInitialization() throws InterruptedException {
+  public void waitForInitialization() throws InterruptedException {
     this.statSamplerInitializedLatch.await();
   }
 
@@ -378,7 +378,7 @@ public abstract class HostStatSampler
    * @see #initSpecialStats
    * @since GemFire 7.0
    */
-  public final boolean waitForInitialization(long ms) throws InterruptedException {
+  public boolean waitForInitialization(long ms) throws InterruptedException {
     return awaitInitialization(ms, TimeUnit.MILLISECONDS);
   }
 
@@ -387,12 +387,12 @@ public abstract class HostStatSampler
    *
    * @see #initSpecialStats
    */
-  public final boolean awaitInitialization(final long timeout, final TimeUnit unit)
+  public boolean awaitInitialization(final long timeout, final TimeUnit unit)
       throws InterruptedException {
     return this.statSamplerInitializedLatch.await(timeout, unit);
   }
 
-  public final void changeArchive(File newFile) {
+  public void changeArchive(File newFile) {
     this.sampleCollector.changeArchive(newFile, timer.getTime());
   }
 
@@ -401,7 +401,7 @@ public abstract class HostStatSampler
    *
    * @since GemFire 3.5
    */
-  public final VMStatsContract getVMStats() {
+  public VMStatsContract getVMStats() {
     return this.vmStats;
   }
 
@@ -449,19 +449,19 @@ public abstract class HostStatSampler
     return getStatisticsManager().getId();
   }
 
-  protected final boolean fileSizeLimitInKB() {
+  protected boolean fileSizeLimitInKB() {
     return this.fileSizeLimitInKB;
   }
 
-  protected final boolean osStatsDisabled() {
+  protected boolean osStatsDisabled() {
     return this.osStatsDisabled;
   }
 
-  protected final boolean stopRequested() {
+  protected boolean stopRequested() {
     return stopper.isCancelInProgress() || this.stopRequested;
   }
 
-  public final SampleCollector getSampleCollector() {
+  public SampleCollector getSampleCollector() {
     return this.sampleCollector;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java
index 02292aa..28056e5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java
@@ -165,7 +165,7 @@ public class LocalStatisticsImpl extends StatisticsImpl {
   ////////////////////// Instance Methods //////////////////////
 
   @Override
-  public final boolean isAtomic() {
+  public boolean isAtomic() {
     return intLocks != null || longLocks != null || doubleLocks != null;
   }
 
@@ -180,41 +180,41 @@ public class LocalStatisticsImpl extends StatisticsImpl {
   //////////////////////// store() Methods ///////////////////////
 
   @Override
-  protected final void _setInt(int offset, int value) {
+  protected void _setInt(int offset, int value) {
     this.intStorage[offset] = value;
   }
 
   @Override
-  protected final void _setLong(int offset, long value) {
+  protected void _setLong(int offset, long value) {
     this.longStorage[offset] = value;
   }
 
   @Override
-  protected final void _setDouble(int offset, double value) {
+  protected void _setDouble(int offset, double value) {
     this.doubleStorage[offset] = value;
   }
 
   /////////////////////// get() Methods ///////////////////////
 
   @Override
-  protected final int _getInt(int offset) {
+  protected int _getInt(int offset) {
     return this.intStorage[offset];
   }
 
   @Override
-  protected final long _getLong(int offset) {
+  protected long _getLong(int offset) {
     return this.longStorage[offset];
   }
 
   @Override
-  protected final double _getDouble(int offset) {
+  protected double _getDouble(int offset) {
     return this.doubleStorage[offset];
   }
 
   //////////////////////// inc() Methods ////////////////////////
 
   @Override
-  protected final void _incInt(int offset, int delta) {
+  protected void _incInt(int offset, int delta) {
     if (this.intLocks != null) {
       synchronized (this.intLocks[offset]) {
         this.intStorage[offset] += delta;
@@ -225,7 +225,7 @@ public class LocalStatisticsImpl extends StatisticsImpl {
   }
 
   @Override
-  protected final void _incLong(int offset, long delta) {
+  protected void _incLong(int offset, long delta) {
     if (this.longLocks != null) {
       synchronized (this.longLocks[offset]) {
         this.longStorage[offset] += delta;
@@ -236,7 +236,7 @@ public class LocalStatisticsImpl extends StatisticsImpl {
   }
 
   @Override
-  protected final void _incDouble(int offset, double delta) {
+  protected void _incDouble(int offset, double delta) {
     if (this.doubleLocks != null) {
       synchronized (this.doubleLocks[offset]) {
         this.doubleStorage[offset] += delta;
@@ -248,15 +248,15 @@ public class LocalStatisticsImpl extends StatisticsImpl {
 
   /////////////////// internal package methods //////////////////
 
-  final int[] _getIntStorage() {
+  int[] _getIntStorage() {
     return this.intStorage;
   }
 
-  final long[] _getLongStorage() {
+  long[] _getLongStorage() {
     return this.longStorage;
   }
 
-  final double[] _getDoubleStorage() {
+  double[] _getDoubleStorage() {
     return this.doubleStorage;
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
index 2abbecd..0fc76cf 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
@@ -293,7 +293,7 @@ public class SampleCollector {
     }
   }
 
-  public final void changeArchive(File newFile, long nanosTimeStamp) {
+  public void changeArchive(File newFile, long nanosTimeStamp) {
     synchronized (this.sampleHandlers) {
       if (logger.isTraceEnabled(LogMarker.STATISTICS)) {
         logger.trace(LogMarker.STATISTICS,


Mime
View raw message