You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/05/16 02:19:51 UTC

[41/78] geode git commit: GEODE-2929: remove final from methods on internal classes

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java
index 7d90bef..f569ff7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java
@@ -222,11 +222,11 @@ public class EvictionAttributesImpl extends EvictionAttributes
     return this.algorithm.isLIFO();
   }
 
-  public final boolean isLIFOEntry() {
+  public boolean isLIFOEntry() {
     return this.algorithm == EvictionAlgorithm.LIFO_ENTRY;
   }
 
-  public final boolean isLIFOMemory() {
+  public boolean isLIFOMemory() {
     return this.algorithm == EvictionAlgorithm.LIFO_MEMORY;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
index 14edad9..1d65579 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
@@ -107,7 +107,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
   }
 
   /** Return the absolute time when TTL expiration occurs, or 0 if not used */
-  public final long getTTLExpirationTime() throws EntryNotFoundException {
+  public long getTTLExpirationTime() throws EntryNotFoundException {
     long ttl = getTTLAttributes().getTimeout();
     long tilt = 0;
     if (ttl > 0) {
@@ -120,7 +120,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
   }
 
   /** Return the absolute time when idle expiration occurs, or 0 if not used */
-  public final long getIdleExpirationTime() throws EntryNotFoundException {
+  public long getIdleExpirationTime() throws EntryNotFoundException {
     long idle = getIdleAttributes().getTimeout();
     long tilt = 0;
     if (idle > 0) {
@@ -136,7 +136,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
    * Returns the number of milliseconds until this task should expire. The return value will never
    * be negative.
    */
-  final long getExpiryMillis() throws EntryNotFoundException {
+  long getExpiryMillis() throws EntryNotFoundException {
     long extm = getExpirationTime() - getNow();
     if (extm < 0L)
       return 0L;
@@ -185,13 +185,13 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
    * 
    * @since GemFire 5.0
    */
-  public final static void suspendExpiration() {
+  public static void suspendExpiration() {
     synchronized (suspendLock) {
       expirationSuspended = true;
     }
   }
 
-  public final static void permitExpiration() {
+  public static void permitExpiration() {
     synchronized (suspendLock) {
       expirationSuspended = false;
       suspendLock.notifyAll();
@@ -204,7 +204,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
    * 
    * @since GemFire 5.0
    */
-  private final void waitOnExpirationSuspension() {
+  private void waitOnExpirationSuspension() {
     for (;;) {
       getLocalRegion().getCancelCriterion().checkCancelInProgress(null);
       synchronized (suspendLock) {
@@ -227,7 +227,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
     } // for
   }
 
-  protected final boolean expire(boolean isPending) throws CacheException {
+  protected boolean expire(boolean isPending) throws CacheException {
     ExpirationAction action = getAction();
     if (action == null)
       return false;
@@ -268,12 +268,12 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
     return action != null && (action.isInvalidate() || action.isDestroy());
   }
 
-  final LocalRegion getLocalRegion() {
+  LocalRegion getLocalRegion() {
     return this.region;
   }
 
 
-  protected final boolean expire(ExpirationAction action, boolean isPending) throws CacheException {
+  protected boolean expire(ExpirationAction action, boolean isPending) throws CacheException {
     if (action.isInvalidate())
       return invalidate();
     if (action.isDestroy())

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java
index bae061e..1cc7eeb 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java
@@ -53,7 +53,7 @@ public class FunctionStreamingOrderedReplyMessage extends FunctionStreamingReply
     return FUNCTION_STREAMING_ORDERED_REPLY_MESSAGE;
   }
 
-  final public int getProcessorType() {
+  public int getProcessorType() {
     return DistributionManager.SERIAL_EXECUTOR;
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
index c21667d..8d28a53 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
@@ -387,15 +387,15 @@ public abstract class GridAdvisor extends DistributionAdvisor {
       this.gp = gp;
     }
 
-    public final InternalDistributedMember getMemberId() {
+    public InternalDistributedMember getMemberId() {
       return this.gp.getDistributedMember();
     }
 
-    public final String getHost() {
+    public String getHost() {
       return this.gp.getHost();
     }
 
-    public final int getPort() {
+    public int getPort() {
       return this.gp.getPort();
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
index e1d3d6b..f9b1009 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
@@ -211,7 +211,7 @@ public class HARegion extends DistributedRegion {
   }
 
   @Override
-  public final Object put(Object key, Object value, Object aCallbackArgument)
+  public Object put(Object key, Object value, Object aCallbackArgument)
       throws TimeoutException, CacheWriterException {
     checkReadiness();
 
@@ -323,7 +323,7 @@ public class HARegion extends DistributedRegion {
    * Never genearte EventID for any Entry or Region operation on the HARegion
    */
   @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/InlineKeyHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InlineKeyHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InlineKeyHelper.java
index f86c92c..ce44f1f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InlineKeyHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InlineKeyHelper.java
@@ -33,7 +33,7 @@ public class InlineKeyHelper {
    * Given the number of longs used to encode the inline string return the maximum number of
    * characters that can be encoded into that many longs.
    */
-  public static final int getMaxInlineStringKey(int longCount, boolean byteEncoded) {
+  public static int getMaxInlineStringKey(int longCount, boolean byteEncoded) {
     return (longCount * (byteEncoded ? 8 : 4)) - 1;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java b/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java
index 13edb33..aa7671e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java
@@ -64,11 +64,11 @@ public class KeyInfo {
     this.key = keyInfo.key;
   }
 
-  public final Object getKey() {
+  public Object getKey() {
     return this.key;
   }
 
-  public final Object getCallbackArg() {
+  public Object getCallbackArg() {
     return this.callbackArg;
   }
 
@@ -77,19 +77,19 @@ public class KeyInfo {
     return this.value;
   }
 
-  public final int getBucketId() {
+  public int getBucketId() {
     return this.bucketId;
   }
 
-  public final void setKey(Object key) {
+  public void setKey(Object key) {
     this.key = key;
   }
 
-  public final void setBucketId(int bucketId) {
+  public void setBucketId(int bucketId) {
     this.bucketId = bucketId;
   }
 
-  public final void setCallbackArg(Object callbackArg) {
+  public void setCallbackArg(Object callbackArg) {
     this.callbackArg = callbackArg;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 2985fdb..8e7ec68 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -2496,7 +2496,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
     releaseLatch(this.initializationLatchBeforeGetInitialImage);
   }
 
-  final void releaseAfterGetInitialImageLatch() {
+  void releaseAfterGetInitialImageLatch() {
     if (logger.isDebugEnabled()) {
       logger.debug("Releasing Initialization Latch (after initial image) for {}", getFullPath());
     }
@@ -5562,7 +5562,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
    * @return false if ifNew is true and there is an existing key, or ifOld is true and there is no
    *         existing entry; otherwise return true.
    */
-  final boolean basicUpdate(final EntryEventImpl event, final boolean ifNew, final boolean ifOld,
+  boolean basicUpdate(final EntryEventImpl event, final boolean ifNew, final boolean ifOld,
       final long lastModified, final boolean overwriteDestroyed)
       throws TimeoutException, CacheWriterException {
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java
index c6e918e..4074221 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java
@@ -57,7 +57,7 @@ public class OverflowOplogSet implements OplogSet {
   }
 
   @Override
-  public final void modify(LocalRegion lr, DiskEntry entry, ValueWrapper value, boolean async) {
+  public void modify(LocalRegion lr, DiskEntry entry, ValueWrapper value, boolean async) {
     DiskRegion dr = lr.getDiskRegion();
     synchronized (this.overflowMap) {
       if (this.lastOverflowWrite != null) {
@@ -157,11 +157,11 @@ public class OverflowOplogSet implements OplogSet {
     return new OverflowOplog(id, this, getDirectories()[idx], minSize);
   }
 
-  final void addOverflow(OverflowOplog oo) {
+  void addOverflow(OverflowOplog oo) {
     this.overflowMap.put(oo.getOplogId(), oo);
   }
 
-  final void removeOverflow(OverflowOplog oo) {
+  void removeOverflow(OverflowOplog oo) {
     if (!basicRemoveOverflow(oo)) {
       synchronized (this.compactableOverflowMap) {
         this.compactableOverflowMap.remove(oo.getOplogId());
@@ -169,7 +169,7 @@ public class OverflowOplogSet implements OplogSet {
     }
   }
 
-  final boolean basicRemoveOverflow(OverflowOplog oo) {
+  boolean basicRemoveOverflow(OverflowOplog oo) {
     if (this.lastOverflowWrite == oo) {
       this.lastOverflowWrite = null;
     }
@@ -189,7 +189,7 @@ public class OverflowOplogSet implements OplogSet {
     }
   }
 
-  final private void removeOverflow(DiskRegion dr, DiskEntry entry) {
+  private void removeOverflow(DiskRegion dr, DiskEntry entry) {
     // find the overflow oplog that it is currently in and remove the entry from it
     DiskId id = entry.getDiskId();
     synchronized (id) {
@@ -223,13 +223,13 @@ public class OverflowOplogSet implements OplogSet {
     }
   }
 
-  public final OverflowOplog getChild(long oplogId) {
+  public OverflowOplog getChild(long oplogId) {
     // the oplog id is cast to an integer because the overflow
     // map uses integer oplog ids.
     return getChild((int) oplogId);
   }
 
-  public final OverflowOplog getChild(int oplogId) {
+  public OverflowOplog getChild(int oplogId) {
     OverflowOplog result = this.overflowMap.get(oplogId);
     if (result == null) {
       synchronized (this.compactableOverflowMap) {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java
index b7f3e0b..7812a3d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java
@@ -387,19 +387,19 @@ public class PartitionRegionConfig extends ExternalizableDSFID implements Versio
     return ea;
   }
 
-  public final ExpirationAttributes getEntryIdleTimeout() {
+  public ExpirationAttributes getEntryIdleTimeout() {
     return entryIdleTimeout;
   }
 
-  public final ExpirationAttributes getEntryTimeToLive() {
+  public ExpirationAttributes getEntryTimeToLive() {
     return entryTimeToLive;
   }
 
-  public final ExpirationAttributes getRegionIdleTimeout() {
+  public ExpirationAttributes getRegionIdleTimeout() {
     return regionIdleTimeout;
   }
 
-  public final ExpirationAttributes getRegionTimeToLive() {
+  public ExpirationAttributes getRegionTimeToLive() {
     return regionTimeToLive;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
index bc51650..b171a95 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
@@ -2481,7 +2481,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * 
    * @return a List of all entries gathered across all buckets in this data store
    */
-  public final List getEntries() {
+  public List getEntries() {
     final ArrayList al = new ArrayList();
     visitEntries(new EntryVisitor() {
       @Override
@@ -2503,7 +2503,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * 
    * @param validateOnly only perform bucket-to-node validation
    */
-  public final void dumpEntries(final boolean validateOnly) {
+  public void dumpEntries(final boolean validateOnly) {
     if (logger.isDebugEnabled()) {
       logger.debug("[dumpEntries] dumping {}", this);
     }
@@ -2519,7 +2519,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
     }
   }
 
-  public final void dumpBackingMaps() {
+  public void dumpBackingMaps() {
     if (logger.isDebugEnabled()) {
       logger.debug("Bucket maps in {}\n", this);
     }
@@ -2550,7 +2550,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * <i>Test Method</i> Dump all the bucket names in this data store to the logger
    * 
    */
-  public final void dumpBuckets() {
+  public void dumpBuckets() {
     final StringBuffer buf = new StringBuffer("Buckets in ").append(this).append("\n");
     visitBuckets(new BucketVisitor() {
       @Override
@@ -2566,7 +2566,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * <i>Test Method</i> Return the list of all the bucket names in this data store.
    * 
    */
-  public final List getLocalBucketsListTestOnly() {
+  public List getLocalBucketsListTestOnly() {
     final List bucketList = new ArrayList();
     visitBuckets(new BucketVisitor() {
       @Override
@@ -2581,7 +2581,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * <i>Test Method</i> Return the list of all the primary bucket ids in this data store.
    * 
    */
-  public final List getLocalPrimaryBucketsListTestOnly() {
+  public List getLocalPrimaryBucketsListTestOnly() {
     final List primaryBucketList = new ArrayList();
     visitBuckets(new BucketVisitor() {
       @Override
@@ -2600,7 +2600,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * <i>Test Method</i> Return the list of all the non primary bucket ids in this data store.
    * 
    */
-  public final List getLocalNonPrimaryBucketsListTestOnly() {
+  public List getLocalNonPrimaryBucketsListTestOnly() {
     final List nonPrimaryBucketList = new ArrayList();
     visitBuckets(new BucketVisitor() {
       @Override
@@ -2621,7 +2621,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * @param bucketId the id of the bucket to dump
    * @param bucket the Region containing the bucket data
    */
-  public final void dumpBucket(int bucketId, final LocalRegion bucket) {
+  public void dumpBucket(int bucketId, final LocalRegion bucket) {
     Integer buckId = Integer.valueOf(bucketId);
     visitBucket(buckId, bucket, new EntryVisitor() {
       final StringBuffer buf = new StringBuffer("Entries in bucket ").append(bucket).append("\n");

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
index 19cb3f2..d1dc1be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
@@ -738,7 +738,7 @@ public class PartitionedRegionStats {
   // messaging stats
   // ------------------------------------------------------------------------
 
-  public final long startPartitionMessageProcessing() {
+  public long startPartitionMessageProcessing() {
     this.stats.incInt(partitionMessagesReceivedId, 1);
     return startTime();
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
index 036c740..e475d08 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
@@ -92,7 +92,7 @@ public class PersistentOplogSet implements OplogSet {
   /**
    * returns the active child
    */
-  public final Oplog getChild() {
+  public Oplog getChild() {
     return this.child;
   }
 
@@ -547,7 +547,7 @@ public class PersistentOplogSet implements OplogSet {
     }
   }
 
-  private final void initOplogEntryId() {
+  private void initOplogEntryId() {
     this.oplogEntryId.set(DiskStoreImpl.INVALID_ID);
   }
 
@@ -555,7 +555,7 @@ public class PersistentOplogSet implements OplogSet {
    * Sets the last created oplogEntryId to the given value if and only if the given value is greater
    * than the current last created oplogEntryId
    */
-  private final void updateOplogEntryId(long v) {
+  private void updateOplogEntryId(long v) {
     long curVal;
     do {
       curVal = this.oplogEntryId.get();
@@ -569,7 +569,7 @@ public class PersistentOplogSet implements OplogSet {
   /**
    * Returns the last created oplogEntryId. Returns INVALID_ID if no oplogEntryId has been created.
    */
-  final long getOplogEntryId() {
+  long getOplogEntryId() {
     parent.initializeIfNeeded();
     return this.oplogEntryId.get();
   }
@@ -581,7 +581,7 @@ public class PersistentOplogSet implements OplogSet {
    * 
    * @return A disk id that can be used to access this key/value pair on disk
    */
-  final long newOplogEntryId() {
+  long newOplogEntryId() {
     long result = this.oplogEntryId.incrementAndGet();
     return result;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java
index 37a0fe2..02860e6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java
@@ -198,39 +198,39 @@ public class PoolStats {
     return DistributionStats.getStatTime();
   }
 
-  public final void setInitialContacts(int ic) {
+  public void setInitialContacts(int ic) {
     this._stats.setInt(_INITIAL_CONTACTS, ic);
   }
 
-  public final void setServerCount(int sc) {
+  public void setServerCount(int sc) {
     this._stats.setInt(_ENDPOINTS_KNOWN, sc);
   }
 
-  public final void setSubscriptionCount(int qc) {
+  public void setSubscriptionCount(int qc) {
     this._stats.setInt(_SUBSCRIPTION_SERVERS, qc);
   }
 
-  public final void setLocatorCount(int lc) {
+  public void setLocatorCount(int lc) {
     this._stats.setInt(_KNOWN_LOCATORS, lc);
   }
 
-  public final long getLocatorRequests() {
+  public long getLocatorRequests() {
     return this._stats.getLong(_REQUESTS_TO_LOCATOR);
   }
 
-  public final void incLocatorRequests() {
+  public void incLocatorRequests() {
     this._stats.incLong(_REQUESTS_TO_LOCATOR, 1);
   }
 
-  public final void incLocatorResponses() {
+  public void incLocatorResponses() {
     this._stats.incLong(_RESPONSES_FROM_LOCATOR, 1);
   }
 
-  public final void setLocatorRequests(long rl) {
+  public void setLocatorRequests(long rl) {
     this._stats.setLong(_REQUESTS_TO_LOCATOR, rl);
   }
 
-  public final void setLocatorResponses(long rl) {
+  public void setLocatorResponses(long rl) {
     this._stats.setLong(_RESPONSES_FROM_LOCATOR, rl);
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
index 413a1f6..cfc9fdd 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
@@ -356,11 +356,11 @@ public class ProxyBucketRegion implements Bucket {
     return this.advisor.getBucketRedundancy() + 1;
   }
 
-  public final int getBucketId() {
+  public int getBucketId() {
     return this.bid;
   }
 
-  public final int getId() {
+  public int getId() {
     return getBucketId();
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java
index efa580b..fedafc8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java
@@ -365,7 +365,7 @@ class ProxyRegionMap implements RegionMap {
   }
 
   @Override
-  public final boolean lruLimitExceeded(DiskRegionView drv) {
+  public boolean lruLimitExceeded(DiskRegionView drv) {
     return false;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java
index 1d334bc..065d966 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java
@@ -49,32 +49,32 @@ abstract class RegionExpiryTask extends ExpiryTask {
   }
 
   @Override
-  protected final long getLastAccessedTime() {
+  protected long getLastAccessedTime() {
     return getLocalRegion().getLastAccessedTime();
   }
 
   @Override
-  protected final long getLastModifiedTime() {
+  protected long getLastModifiedTime() {
     return getLocalRegion().getLastModifiedTime();
   }
 
   @Override
-  protected final boolean destroy(boolean isPending) throws CacheException {
+  protected boolean destroy(boolean isPending) throws CacheException {
     return getLocalRegion().expireRegion(this, true, true);
   }
 
   @Override
-  protected final boolean invalidate() throws TimeoutException {
+  protected boolean invalidate() throws TimeoutException {
     return getLocalRegion().expireRegion(this, true, false);
   }
 
   @Override
-  protected final boolean localDestroy() throws CacheException {
+  protected boolean localDestroy() throws CacheException {
     return getLocalRegion().expireRegion(this, false, true);
   }
 
   @Override
-  protected final boolean localInvalidate() {
+  protected boolean localInvalidate() {
     return getLocalRegion().expireRegion(this, false, false);
   }
 
@@ -85,7 +85,7 @@ abstract class RegionExpiryTask extends ExpiryTask {
   }
 
   @Override
-  protected final void performTimeout() throws CacheException {
+  protected void performTimeout() throws CacheException {
     if (isCanceled) {
       return;
     }
@@ -93,7 +93,7 @@ abstract class RegionExpiryTask extends ExpiryTask {
   }
 
   @Override
-  protected final void basicPerformTimeout(boolean isPending) throws CacheException {
+  protected void basicPerformTimeout(boolean isPending) throws CacheException {
     if (isCanceled) {
       return;
     }
@@ -110,7 +110,7 @@ abstract class RegionExpiryTask extends ExpiryTask {
   }
 
   @Override
-  final protected void reschedule() throws CacheException {
+  protected void reschedule() throws CacheException {
     if (isCacheClosing() || getLocalRegion().isClosed() || getLocalRegion().isDestroyed()
         || !isExpirationAllowed()) {
       return;

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java
index c54da7f..dfc59cf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java
@@ -58,7 +58,7 @@ class RegionIdleExpiryTask extends RegionExpiryTask {
   }
 
   @Override
-  protected final void addExpiryTask() {
+  protected void addExpiryTask() {
     getLocalRegion().addIdleExpiryTask(this);
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java
index a59b391..96490e5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java
@@ -60,7 +60,7 @@ class RegionTTLExpiryTask extends RegionExpiryTask {
   }
 
   @Override
-  protected final void addExpiryTask() {
+  protected void addExpiryTask() {
     getLocalRegion().addTTLExpiryTask(this);
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java
index 0a55664..081044e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java
@@ -173,11 +173,11 @@ public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply
     this.oldValBytes = valBytes;
   }
 
-  private final void setOldValObj(@Unretained(ENTRY_EVENT_OLD_VALUE) Object o) {
+  private void setOldValObj(@Unretained(ENTRY_EVENT_OLD_VALUE) Object o) {
     this.oldValObj = o;
   }
 
-  public final byte[] getOldValueBytes() {
+  public byte[] getOldValueBytes() {
     return this.oldValBytes;
   }
 
@@ -523,19 +523,19 @@ public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply
     buff.append("; hasOldValue= ").append(this.hasOldValue);
   }
 
-  protected final Object getKey() {
+  protected Object getKey() {
     return this.key;
   }
 
-  private final void setKey(Object key) {
+  private void setKey(Object key) {
     this.key = key;
   }
 
-  public final Operation getOperation() {
+  public Operation getOperation() {
     return this.op;
   }
 
-  protected final Object getCallbackArg() {
+  protected Object getCallbackArg() {
     return this.cbArg;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java
index c72bd58..11afc74 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java
@@ -83,7 +83,7 @@ public class RemoteGetMessage extends RemoteOperationMessageWithDirectReply {
   }
 
   @Override
-  final public int getProcessorType() {
+  public int getProcessorType() {
     return DistributionManager.SERIAL_EXECUTOR;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java
index c491acb..a170aef 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java
@@ -261,7 +261,7 @@ public class RemotePutAllMessage extends RemoteOperationMessageWithDirectReply {
   }
 
   @Override
-  public final void toData(DataOutput out) throws IOException {
+  public void toData(DataOutput out) throws IOException {
     super.toData(out);
     DataSerializer.writeObject(this.eventId, out);
     DataSerializer.writeObject(this.callbackArg, out);
@@ -344,7 +344,7 @@ public class RemotePutAllMessage extends RemoteOperationMessageWithDirectReply {
    *        lastModified timestamp for last modification
    * @return If succeeds, return true, otherwise, throw exception
    */
-  public final boolean doLocalPutAll(final LocalRegion r,
+  public boolean doLocalPutAll(final LocalRegion r,
       final InternalDistributedMember eventSender, long lastModified)
       throws EntryExistsException, RemoteOperationException {
     final DistributedRegion dr = (DistributedRegion) r;
@@ -427,7 +427,7 @@ public class RemotePutAllMessage extends RemoteOperationMessageWithDirectReply {
 
 
   @Override
-  protected final void appendFields(StringBuffer buff) {
+  protected void appendFields(StringBuffer buff) {
     super.appendFields(buff);
     buff.append("; putAllDataCount=").append(putAllDataCount);
     if (this.bridgeContext != null) {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java
index 95e49c8..4135752 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java
@@ -412,30 +412,30 @@ public class RemotePutMessage extends RemoteOperationMessageWithDirectReply
     return processor;
   }
 
-  // public final boolean needsDirectAck()
+  // public boolean needsDirectAck()
   // {
   // return this.directAck;
   // }
 
-  // final public int getProcessorType() {
+  // public int getProcessorType() {
   // return DistributionManager.PARTITIONED_REGION_EXECUTOR;
   // }
 
 
 
-  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;
   }
 
-  public final byte[] getOldValueBytes() {
+  public byte[] getOldValueBytes() {
 
     return this.oldValBytes;
   }
@@ -460,16 +460,16 @@ public class RemotePutMessage extends RemoteOperationMessageWithDirectReply
     this.oldValObj = o;
   }
 
-  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;
   }
 
@@ -486,7 +486,7 @@ public class RemotePutMessage extends RemoteOperationMessageWithDirectReply
   }
 
   @Override
-  public final void fromData(DataInput in) throws IOException, ClassNotFoundException {
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
     super.fromData(in);
     setKey(DataSerializer.readObject(in));
 
@@ -544,7 +544,7 @@ public class RemotePutMessage extends RemoteOperationMessageWithDirectReply
   }
 
   @Override
-  public final void toData(DataOutput out) throws IOException {
+  public void toData(DataOutput out) throws IOException {
     this.hasDelta = false;
     super.toData(out);
     DataSerializer.writeObject(getKey(), out);
@@ -616,7 +616,7 @@ public class RemotePutMessage extends RemoteOperationMessageWithDirectReply
    * indefinitely for the acknowledgement
    */
   @Override
-  protected final boolean operateOnRegion(DistributionManager dm, LocalRegion r, long startTime)
+  protected boolean operateOnRegion(DistributionManager dm, LocalRegion r, long startTime)
       throws EntryExistsException, RemoteOperationException {
     this.setInternalDs(r.getSystem());// set the internal DS. Required to
                                       // checked DS level delta-enabled property
@@ -733,7 +733,7 @@ public class RemotePutMessage extends RemoteOperationMessageWithDirectReply
   }
 
   @Override
-  protected final void appendFields(StringBuffer buff) {
+  protected void appendFields(StringBuffer buff) {
     super.appendFields(buff);
     buff.append("; key=").append(getKey()).append("; value=");
     // buff.append(getValBytes());
@@ -768,11 +768,11 @@ public class RemotePutMessage extends RemoteOperationMessageWithDirectReply
     buff.append(this.applyDeltaBytes);
   }
 
-  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/RemoteRemoveAllMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java
index a9b8c1a..9b57b3f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java
@@ -253,7 +253,7 @@ public class RemoteRemoveAllMessage extends RemoteOperationMessageWithDirectRepl
   }
 
   @Override
-  public final void toData(DataOutput out) throws IOException {
+  public void toData(DataOutput out) throws IOException {
     super.toData(out);
     DataSerializer.writeObject(this.eventId, out);
     DataSerializer.writeObject(this.callbackArg, out);
@@ -333,7 +333,7 @@ public class RemoteRemoveAllMessage extends RemoteOperationMessageWithDirectRepl
    * @param eventSender the endpoint server who received request from client
    * @return If succeeds, return true, otherwise, throw exception
    */
-  public final boolean doLocalRemoveAll(final LocalRegion r,
+  public boolean doLocalRemoveAll(final LocalRegion r,
       final InternalDistributedMember eventSender)
       throws EntryExistsException, RemoteOperationException {
     final DistributedRegion dr = (DistributedRegion) r;
@@ -417,7 +417,7 @@ public class RemoteRemoveAllMessage extends RemoteOperationMessageWithDirectRepl
 
 
   @Override
-  protected final void appendFields(StringBuffer buff) {
+  protected void appendFields(StringBuffer buff) {
     super.appendFields(buff);
     buff.append("; removeAllDataCount=").append(removeAllDataCount);
     if (this.bridgeContext != null) {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java
index d9ef183..43165a7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java
@@ -212,7 +212,7 @@ public class TXEntry implements Region.Entry {
     }
   }
 
-  private final TXEntryUserAttrState txReadUA(KeyInfo ki) {
+  private TXEntryUserAttrState txReadUA(KeyInfo ki) {
     TXRegionState txr = this.myTX.txReadRegion(this.localRegion);
     if (txr != null) {
       return txr.readEntryUserAttr(ki.getKey());
@@ -221,7 +221,7 @@ public class TXEntry implements Region.Entry {
     }
   }
 
-  protected final TXEntryUserAttrState txWriteUA(KeyInfo ki) {
+  protected TXEntryUserAttrState txWriteUA(KeyInfo ki) {
     TXRegionState txr = myTX.txWriteRegion(this.localRegion, ki);
     if (txr != null) {
       return txr.writeEntryUserAttr(ki.getKey(), this.localRegion);

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
index e7bd20d..2ee3a8c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
@@ -434,38 +434,38 @@ public class TXEntryState implements Releasable {
     return v;
   }
 
-  private final boolean isOpCreate() {
+  private boolean isOpCreate() {
     return this.op >= OP_CREATE_LI && this.op <= OP_LOCAL_CREATE;
   }
 
-  final boolean isOpCreateEvent() {
+  boolean isOpCreateEvent() {
     return isOpCreate();
   }
 
-  private final boolean isOpPut() {
+  private boolean isOpPut() {
     return this.op >= OP_PUT;
   }
 
-  protected final boolean isOpPutEvent() {
+  protected boolean isOpPutEvent() {
     return isOpPut();
   }
 
-  private final boolean isOpInvalidate() {
+  private boolean isOpInvalidate() {
     // Note that OP_CREATE_LI, OP_LLOAD_CREATE_LI, and OP_NLOAD_CREATE_LI
     // do not return true here because they are actually creates
     // with a value of LOCAL_INVALID locally and some other value remotely.
     return this.op <= OP_D_INVALIDATE && this.op >= OP_L_INVALIDATE;
   }
 
-  final boolean isOpInvalidateEvent() {
+  boolean isOpInvalidateEvent() {
     return isOpInvalidate();
   }
 
-  private final boolean isOpDestroy() {
+  private boolean isOpDestroy() {
     return this.op <= OP_D_DESTROY && this.op >= OP_L_DESTROY;
   }
 
-  final boolean isOpDestroyEvent(LocalRegion r) {
+  boolean isOpDestroyEvent(LocalRegion r) {
     // Note that if the region is a proxy then we go ahead and distributed
     // the destroy because we can't eliminate it based on committed state
     return isOpDestroy()
@@ -477,31 +477,31 @@ public class TXEntryState implements Releasable {
    * 
    * @since GemFire 5.0
    */
-  final boolean isOpAnyEvent(LocalRegion r) {
+  boolean isOpAnyEvent(LocalRegion r) {
     return isOpPutEvent() || isOpCreateEvent() || isOpInvalidateEvent() || isOpDestroyEvent(r);
   }
 
-  final boolean isOpSearchOrLoad() {
+  boolean isOpSearchOrLoad() {
     return this.op >= OP_SEARCH_CREATE && this.op != OP_PUT && this.op != OP_LOCAL_CREATE;
   }
 
-  final boolean isOpSearch() {
+  boolean isOpSearch() {
     return this.op == OP_SEARCH_CREATE || this.op == OP_SEARCH_PUT;
   }
 
-  final boolean isOpLocalLoad() {
+  boolean isOpLocalLoad() {
     return this.op == OP_LLOAD_CREATE || this.op == OP_LLOAD_PUT;
   }
 
-  final boolean isOpNetLoad() {
+  boolean isOpNetLoad() {
     return this.op == OP_NLOAD_CREATE || this.op == OP_NLOAD_PUT;
   }
 
-  final boolean isOpLoad() {
+  boolean isOpLoad() {
     return isOpLocalLoad() || isOpNetLoad();
   }
 
-  // private final boolean isLocalEventDistributed()
+  // private boolean isLocalEventDistributed()
   // {
   // return this.op == OP_D_DESTROY
   // || (this.op >= OP_D_INVALIDATE && this.op != OP_SEARCH_CREATE
@@ -1490,11 +1490,11 @@ public class TXEntryState implements Releasable {
     return "<" + StringUtils.forceToString(o) + ">";
   }
 
-  private final boolean didDestroy() {
+  private boolean didDestroy() {
     return this.destroy != DESTROY_NONE;
   }
 
-  private final boolean didDistributedDestroy() {
+  private boolean didDistributedDestroy() {
     return this.destroy == DESTROY_DISTRIBUTED;
   }
 
@@ -1553,7 +1553,7 @@ public class TXEntryState implements Releasable {
     return isOpCreate();
   }
 
-  private final void txApplyDestroyLocally(LocalRegion r, Object key, TXState txState) {
+  private void txApplyDestroyLocally(LocalRegion r, Object key, TXState txState) {
     boolean invokeCallbacks = isOpDestroyEvent(r);
     List<EntryEventImpl> pendingCallbacks =
         invokeCallbacks ? txState.getPendingCallbacks() : new ArrayList<EntryEventImpl>();
@@ -1571,7 +1571,7 @@ public class TXEntryState implements Releasable {
     // transaction listener that no destroy was done.
   }
 
-  private final void txApplyInvalidateLocally(LocalRegion r, Object key, Object newValue,
+  private void txApplyInvalidateLocally(LocalRegion r, Object key, Object newValue,
       boolean didDestroy, TXState txState) {
     try {
       r.txApplyInvalidate(key, newValue, didDestroy, txState.getTransactionId(), null,
@@ -1583,7 +1583,7 @@ public class TXEntryState implements Releasable {
     }
   }
 
-  private final void txApplyPutLocally(LocalRegion r, Operation putOp, Object key, Object newValue,
+  private void txApplyPutLocally(LocalRegion r, Operation putOp, Object key, Object newValue,
       boolean didDestroy, TXState txState) {
     try {
       r.txApplyPut(putOp, key, newValue, didDestroy, txState.getTransactionId(), null,

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/TXFarSideCMTracker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXFarSideCMTracker.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXFarSideCMTracker.java
index a7d06be..b7ab7e8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXFarSideCMTracker.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXFarSideCMTracker.java
@@ -83,7 +83,7 @@ public class TXFarSideCMTracker {
     this.lastHistoryItem = 0;
   }
 
-  public final int getHistorySize() {
+  public int getHistorySize() {
     return this.txHistory.length;
   }
 
@@ -91,7 +91,7 @@ public class TXFarSideCMTracker {
    * Answers fellow "Far Siders" question about an DACK transaction when the transaction originator
    * died before it sent the CommitProcess message.
    */
-  public final boolean commitProcessReceived(Object key, DM dm) {
+  public boolean commitProcessReceived(Object key, DM dm) {
     // Assume that after the member has departed that we have all its pending
     // transaction messages
     if (key instanceof TXLockId) {
@@ -137,7 +137,7 @@ public class TXFarSideCMTracker {
    * Answers new Grantor query regarding whether it can start handing out new locks. Waits until
    * txInProgress is empty.
    */
-  public final void waitForAllToProcess() throws InterruptedException {
+  public void waitForAllToProcess() throws InterruptedException {
     if (Thread.interrupted())
       throw new InterruptedException(); // wisest to do this before the synchronize below
     // Assume that a thread interrupt is only sent in the
@@ -155,7 +155,7 @@ public class TXFarSideCMTracker {
    * departed/ing Originator (this will most likely be called nearly the same time as
    * commitProcessReceived
    */
-  public final void waitToProcess(TXLockId lk, DM dm) {
+  public void waitToProcess(TXLockId lk, DM dm) {
     waitForMemberToDepart(lk.getMemberId(), dm);
     final TXCommitMessage mess;
     synchronized (this.txInProgress) {
@@ -189,7 +189,7 @@ public class TXFarSideCMTracker {
   /**
    * Register a <code>MemberhipListener</code>, wait until the member is gone.
    */
-  private final void waitForMemberToDepart(final InternalDistributedMember memberId, DM dm) {
+  private void waitForMemberToDepart(final InternalDistributedMember memberId, DM dm) {
     if (!dm.getDistributionManagerIds().contains(memberId)) {
       return;
     }
@@ -239,7 +239,7 @@ public class TXFarSideCMTracker {
    * Indicate that the transaction message has been processed and to place it in the transaction
    * history
    */
-  public final TXCommitMessage processed(TXCommitMessage processedMess) {
+  public TXCommitMessage processed(TXCommitMessage processedMess) {
     final TXCommitMessage mess;
     final Object key = processedMess.getTrackerKey();
     synchronized (this.txInProgress) {
@@ -269,7 +269,7 @@ public class TXFarSideCMTracker {
    * Indicate that this message is never going to be processed, typically used in the case where
    * none of the FarSiders received the CommitProcessMessage
    **/
-  public final void removeMessage(TXCommitMessage deadMess) {
+  public void removeMessage(TXCommitMessage deadMess) {
     synchronized (this.txInProgress) {
       this.txInProgress.remove(deadMess.getTrackerKey());
       // For any waitForAllToComplete
@@ -282,7 +282,7 @@ public class TXFarSideCMTracker {
   /**
    * Retrieve the commit message associated with the lock
    */
-  public final TXCommitMessage get(Object key) {
+  public TXCommitMessage get(Object key) {
     final TXCommitMessage mess;
     synchronized (this.txInProgress) {
       mess = (TXCommitMessage) this.txInProgress.get(key);
@@ -290,7 +290,7 @@ public class TXFarSideCMTracker {
     return mess;
   }
 
-  public final TXCommitMessage waitForMessage(Object key, DM dm) {
+  public TXCommitMessage waitForMessage(Object key, DM dm) {
     TXCommitMessage msg = null;
     synchronized (this.txInProgress) {
       msg = (TXCommitMessage) this.txInProgress.get(key);
@@ -310,7 +310,7 @@ public class TXFarSideCMTracker {
   /**
    * The transcation commit message has been received
    */
-  public final void add(TXCommitMessage msg) {
+  public void add(TXCommitMessage msg) {
     synchronized (this.txInProgress) {
       final Object key = msg.getTrackerKey();
       if (key == null) {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java
index e1a2ece..261f90c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java
@@ -107,7 +107,7 @@ public class TXReservationMgr {
     }
   }
 
-  private final Object getRegionObject(TXRegionLockRequestImpl lr) {
+  private Object getRegionObject(TXRegionLockRequestImpl lr) {
     if (local) {
       return lr.getLocalRegion();
     } else {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
index 0a9d80e..6a6e9ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
@@ -1220,7 +1220,7 @@ public class TXState implements TXStateInterface {
    * @param ifNew only write the entry if it currently does not exist
    * @param expectedOldValue the required old value or null
    */
-  final TXEntryState txWriteEntry(LocalRegion region, EntryEventImpl event, boolean ifNew,
+  TXEntryState txWriteEntry(LocalRegion region, EntryEventImpl event, boolean ifNew,
       boolean requireOldValue, Object expectedOldValue) throws EntryNotFoundException {
     boolean createIfAbsent = true;
     if (event.getOperation() == Operation.REPLACE) {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java
index 22b95f3..6b6b712 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java
@@ -86,15 +86,15 @@ public class TXStateProxyImpl implements TXStateProxy {
     return this.lock;
   }
 
-  final boolean isJTA() {
+  boolean isJTA() {
     return isJTA;
   }
 
-  final public TXId getTxId() {
+  public TXId getTxId() {
     return txId;
   }
 
-  public final TXManagerImpl getTxMgr() {
+  public TXManagerImpl getTxMgr() {
     return txMgr;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java
index 9917533..f2809a6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java
@@ -88,23 +88,23 @@ public abstract class Token {
   /**
    * Returns true if o is INVALID, LOCAL_INVALID, DESTROYED, or REMOVED.
    */
-  public static final boolean isInvalidOrRemoved(Object o) {
+  public static boolean isInvalidOrRemoved(Object o) {
     return isInvalid(o) || isRemoved(o);
   }
 
-  public static final boolean isInvalid(Object o) {
+  public static boolean isInvalid(Object o) {
     return o == INVALID || o == LOCAL_INVALID;
   }
 
-  public static final boolean isRemoved(Object o) {
+  public static boolean isRemoved(Object o) {
     return o == DESTROYED || o == REMOVED_PHASE1 || o == REMOVED_PHASE2 || o == TOMBSTONE;
   }
 
-  public static final boolean isRemovedFromDisk(Object o) {
+  public static boolean isRemovedFromDisk(Object o) {
     return o == DESTROYED || o == REMOVED_PHASE1 || o == REMOVED_PHASE2;
   }
 
-  public static final boolean isDestroyed(Object o) {
+  public static boolean isDestroyed(Object o) {
     return o == DESTROYED;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateOperation.java
index cd41201..2ba9517 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateOperation.java
@@ -502,7 +502,7 @@ public class UpdateOperation extends AbstractUpdateOperation {
 
     @Override
     @Retained
-    final public EntryEventImpl createEntryEvent(DistributedRegion rgn) {
+    public EntryEventImpl createEntryEvent(DistributedRegion rgn) {
       // Object oldValue = null;
       final Object argNewValue = null;
       // boolean localLoad = false, netLoad = false, netSearch = false,

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/VMLRURegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMLRURegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMLRURegionMap.java
index 65a4bfd..3a32efd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMLRURegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMLRURegionMap.java
@@ -42,22 +42,22 @@ class VMLRURegionMap extends AbstractLRURegionMap {
   private NewLRUClockHand lruList;
 
   @Override
-  protected final void _setCCHelper(EnableLRU ccHelper) {
+  protected void _setCCHelper(EnableLRU ccHelper) {
     this.ccHelper = ccHelper;
   }
 
   @Override
-  protected final EnableLRU _getCCHelper() {
+  protected EnableLRU _getCCHelper() {
     return this.ccHelper;
   }
 
   @Override
-  protected final void _setLruList(NewLRUClockHand lruList) {
+  protected void _setLruList(NewLRUClockHand lruList) {
     this.lruList = lruList;
   }
 
   @Override
-  public final NewLRUClockHand _getLruList() {
+  public NewLRUClockHand _getLruList() {
     return this.lruList;
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
index 5d5a3fa..8a16ea1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
@@ -755,7 +755,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
    * 
    * @return True if the member's heap memory is in a critical state, false otherwise.
    */
-  public final boolean isMemberHeapCritical(final InternalDistributedMember member) {
+  public boolean isMemberHeapCritical(final InternalDistributedMember member) {
     if (member.equals(this.cache.getMyId())) {
       return this.mostRecentEvent.getState().isCritical();
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java
index ceaeb4b..c701b3f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java
@@ -168,7 +168,7 @@ public class MemoryThresholds {
         - (0.01 * THRESHOLD_THICKNESS_EVICT * this.maxMemoryBytes));
   }
 
-  public static final boolean isLowMemoryExceptionDisabled() {
+  public static boolean isLowMemoryExceptionDisabled() {
     return DISABLE_LOW_MEM_EXCEPTION;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java
index f09a378..af1d6f9 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java
@@ -116,7 +116,7 @@ public abstract class AbstractExecution implements InternalExecution {
 
   public static final byte HA_HASRESULT_OPTIMIZEFORWRITE_REEXECUTE = 15;
 
-  public static final byte getFunctionState(boolean isHA, boolean hasResult,
+  public static byte getFunctionState(boolean isHA, boolean hasResult,
       boolean optimizeForWrite) {
     if (isHA) {
       if (hasResult) {
@@ -144,7 +144,7 @@ public abstract class AbstractExecution implements InternalExecution {
     }
   }
 
-  public static final byte getReexecuteFunctionState(byte fnState) {
+  public static byte getReexecuteFunctionState(byte fnState) {
     if (fnState == HA_HASRESULT_NO_OPTIMIZEFORWRITE) {
       return HA_HASRESULT_NO_OPTIMIZEFORWRITE_REEXECUTE;
     } else if (fnState == HA_HASRESULT_OPTIMIZEFORWRITE) {
@@ -238,16 +238,16 @@ public abstract class AbstractExecution implements InternalExecution {
     return isFnSerializationReqd;
   }
 
-  public final Collection<InternalDistributedMember> getExecutionNodes() {
+  public Collection<InternalDistributedMember> getExecutionNodes() {
     return this.executionNodes;
   }
 
-  public final void setRequireExecutionNodes(ExecutionNodesListener listener) {
+  public void setRequireExecutionNodes(ExecutionNodesListener listener) {
     this.executionNodes = Collections.emptySet();
     this.executionNodesListener = listener;
   }
 
-  public final void setExecutionNodes(Set<InternalDistributedMember> nodes) {
+  public void setExecutionNodes(Set<InternalDistributedMember> nodes) {
     if (this.executionNodes != null) {
       this.executionNodes = nodes;
       if (this.executionNodesListener != null) {
@@ -256,7 +256,7 @@ public abstract class AbstractExecution implements InternalExecution {
     }
   }
 
-  public final void executeFunctionOnLocalPRNode(final Function fn, final FunctionContext cx,
+  public void executeFunctionOnLocalPRNode(final Function fn, final FunctionContext cx,
       final PartitionedRegionFunctionResultSender sender, DM dm, boolean isTx) {
     if (dm instanceof DistributionManager && !isTx) {
       if (ServerConnection.isExecuteFunctionOnLocalNodeOnly().byteValue() == 1) {
@@ -294,7 +294,7 @@ public abstract class AbstractExecution implements InternalExecution {
   // Bug41118 : in case of lonerDistribuedSystem do local execution through
   // main thread otherwise give execution to FunctionExecutor from
   // DistributionManager
-  public final void executeFunctionOnLocalNode(final Function fn, final FunctionContext cx,
+  public void executeFunctionOnLocalNode(final Function fn, final FunctionContext cx,
       final ResultSender sender, DM dm, final boolean isTx) {
     if (dm instanceof DistributionManager && !isTx) {
       final DistributionManager newDM = (DistributionManager) dm;
@@ -318,7 +318,7 @@ public abstract class AbstractExecution implements InternalExecution {
     }
   }
 
-  public final void executeFunctionLocally(final Function fn, final FunctionContext cx,
+  public void executeFunctionLocally(final Function fn, final FunctionContext cx,
       final ResultSender sender, DM dm) {
 
     FunctionStats stats = FunctionStats.getFunctionStats(fn.getId(), dm.getSystem());
@@ -396,7 +396,7 @@ public abstract class AbstractExecution implements InternalExecution {
     return executeFunction(function);
   }
 
-  public final void setWaitOnExceptionFlag(boolean waitOnException) {
+  public void setWaitOnExceptionFlag(boolean waitOnException) {
     this.setForwardExceptions(waitOnException);
     this.waitOnException = waitOnException;
   }
@@ -438,7 +438,7 @@ public abstract class AbstractExecution implements InternalExecution {
    */
   public abstract void validateExecution(Function function, Set targetMembers);
 
-  public final LocalResultCollector<?, ?> getLocalResultCollector(Function function,
+  public LocalResultCollector<?, ?> getLocalResultCollector(Function function,
       final ResultCollector<?, ?> rc) {
     if (rc instanceof LocalResultCollector) {
       return (LocalResultCollector) rc;

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
index c616cbd..39190f3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
@@ -63,7 +63,7 @@ public class FunctionContextImpl implements FunctionContext {
    * 
    * @return the arguments or null if there are no arguments
    */
-  public final Object getArguments() {
+  public Object getArguments() {
     return this.args;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
index 4d067e4..0fd607c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
@@ -50,11 +50,11 @@ public class TXLockIdImpl implements TXLockId, DataSerializableFixedID {
     }
   }
 
-  public final int getCount() {
+  public int getCount() {
     return this.id;
   }
 
-  public final InternalDistributedMember getMemberId() {
+  public InternalDistributedMember getMemberId() {
     return this.memberId;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUStatistics.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUStatistics.java
index ea8018a..105d4de 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUStatistics.java
@@ -44,7 +44,7 @@ public class HeapLRUStatistics extends LRUStatistics {
    * @see EnableLRU#mustEvict
    */
   @Override
-  final public void updateCounter(long delta) {
+  public void updateCounter(long delta) {
     super.updateCounter(delta);
   }
 
@@ -54,7 +54,7 @@ public class HeapLRUStatistics extends LRUStatistics {
    * <b>NOT</b> reset the counter value.
    */
   @Override
-  final public void resetCounter() {
+  public void resetCounter() {
     super.resetCounter();
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLRUClockHand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLRUClockHand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLRUClockHand.java
index d9d6be1..ccab3c7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLRUClockHand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLRUClockHand.java
@@ -141,7 +141,7 @@ public class NewLRUClockHand {
    *
    * @param aNode Description of the Parameter
    */
-  public final void appendEntry(final LRUClockNode aNode) {
+  public void appendEntry(final LRUClockNode aNode) {
     synchronized (this.lock) {
       if (aNode.nextLRUNode() != null || aNode.prevLRUNode() != null) {
         return;

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
index 02faa25..910de64 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
@@ -54,7 +54,7 @@ public class AllBucketProfilesUpdateMessage extends DistributionMessage
   public AllBucketProfilesUpdateMessage() {}
 
   @Override
-  final public int getProcessorType() {
+  public int getProcessorType() {
     return DistributionManager.WAITING_POOL_EXECUTOR;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage.java
index 31b8af2..e4fefbb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage.java
@@ -113,7 +113,7 @@ public class BecomePrimaryBucketMessage extends PartitionMessage {
   }
 
   @Override
-  protected final boolean operateOnPartitionedRegion(DistributionManager dm,
+  protected boolean operateOnPartitionedRegion(DistributionManager dm,
       PartitionedRegion region, long startTime) throws ForceReattemptException {
 
     // this is executing in the WAITING_POOL_EXECUTOR

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage.java
index 1d92687..e353393 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage.java
@@ -54,7 +54,7 @@ public class BucketProfileUpdateMessage extends DistributionMessage implements M
   public BucketProfileUpdateMessage() {}
 
   @Override
-  final public int getProcessorType() {
+  public int getProcessorType() {
     return DistributionManager.WAITING_POOL_EXECUTOR;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketSizeMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketSizeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketSizeMessage.java
index bd83c1b..ee5d1be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketSizeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketSizeMessage.java
@@ -66,7 +66,7 @@ public class BucketSizeMessage extends PartitionMessage {
   }
 
   @Override
-  final public int getProcessorType() {
+  public int getProcessorType() {
     return DistributionManager.STANDARD_EXECUTOR;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java
index 962eb1a..90f3396 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java
@@ -81,7 +81,7 @@ public class CreateBucketMessage extends PartitionMessage {
   }
 
   @Override
-  final public int getProcessorType() {
+  public int getProcessorType() {
     return DistributionManager.WAITING_POOL_EXECUTOR;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java
index bffaf4d..7009a98 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java
@@ -442,19 +442,19 @@ public class DestroyMessage extends PartitionMessageWithDirectReply {
     }
   }
 
-  protected final Object getKey() {
+  protected Object getKey() {
     return this.key;
   }
 
-  private final void setKey(Object key) {
+  private void setKey(Object key) {
     this.key = key;
   }
 
-  public final Operation getOperation() {
+  public Operation getOperation() {
     return this.op;
   }
 
-  protected final Object getCallbackArg() {
+  protected Object getCallbackArg() {
     return this.cbArg;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
index 1d2ab7b..d0c959c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
@@ -101,13 +101,13 @@ public class DestroyRegionOnDataStoreMessage extends PartitionMessage {
   }
 
   @Override
-  public final void fromData(final DataInput in) throws IOException, ClassNotFoundException {
+  public void fromData(final DataInput in) throws IOException, ClassNotFoundException {
     super.fromData(in);
     callbackArg = DataSerializer.readObject(in);
   }
 
   @Override
-  public final void toData(final DataOutput out) throws IOException {
+  public void toData(final DataOutput out) throws IOException {
     super.toData(out);
     DataSerializer.writeObject(callbackArg, out);
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java
index 0502d5f..7e412c0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java
@@ -90,7 +90,7 @@ public class EndBucketCreationMessage extends PartitionMessage {
   }
 
   @Override
-  protected final boolean operateOnPartitionedRegion(DistributionManager dm,
+  protected boolean operateOnPartitionedRegion(DistributionManager dm,
       PartitionedRegion region, long startTime) throws ForceReattemptException {
 
     // this is executing in the WAITING_POOL_EXECUTOR

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java
index 0e3f74b..c121535 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java
@@ -102,7 +102,7 @@ public class GetMessage extends PartitionMessageWithDirectReply {
       Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "order-pr-gets");
 
   @Override
-  final public int getProcessorType() {
+  public int getProcessorType() {
     if (!forceUseOfPRExecutor && !ORDER_PR_GETS && !isDirectAck()) {
       try {
         PartitionedRegion pr = PartitionedRegion.getPRFromId(this.regionId);

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
index c71aa40..8ce3a47 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
@@ -90,7 +90,7 @@ public class IndexCreationMsg extends PartitionMessage {
    * of the initialization
    */
   @Override
-  protected final boolean failIfRegionMissing() {
+  protected boolean failIfRegionMissing() {
     return false;
   }
 
@@ -413,7 +413,7 @@ public class IndexCreationMsg extends PartitionMessage {
   }
 
   @Override
-  public final void fromData(DataInput in) throws IOException, ClassNotFoundException {
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
     super.fromData(in);
     this.indexDefinitions = DataSerializer.readHashSet(in);
   }
@@ -424,7 +424,7 @@ public class IndexCreationMsg extends PartitionMessage {
   }
 
   @Override
-  public final void toData(DataOutput out) throws IOException {
+  public void toData(DataOutput out) throws IOException {
     super.toData(out);
     DataSerializer.writeHashSet(this.indexDefinitions, out);
   }
@@ -433,7 +433,7 @@ public class IndexCreationMsg extends PartitionMessage {
    * String representation of this message.
    */
   @Override
-  public final String toString() {
+  public String toString() {
     StringBuffer sb = new StringBuffer();
     for (IndexCreationData icd : indexDefinitions) {
       sb.append(icd.getIndexName()).append(" ");
@@ -634,7 +634,7 @@ public class IndexCreationMsg 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) {
       if (logger.isDebugEnabled()) {
         logger.debug("Processor id is : {}", this.processorId);
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InterestEventMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InterestEventMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InterestEventMessage.java
index 8259818..7bccf5b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InterestEventMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InterestEventMessage.java
@@ -63,12 +63,12 @@ public class InterestEventMessage extends PartitionMessage {
   }
 
   @Override
-  final public int getProcessorType() {
+  public int getProcessorType() {
     return DistributionManager.STANDARD_EXECUTOR;
   }
 
   @Override
-  protected final boolean operateOnPartitionedRegion(final DistributionManager dm,
+  protected boolean operateOnPartitionedRegion(final DistributionManager dm,
       PartitionedRegion r, long startTime) throws ForceReattemptException {
     if (logger.isTraceEnabled(LogMarker.DM)) {
       logger.debug("InterestEventMessage operateOnPartitionedRegion: {}", r.getFullPath());

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java
index 170322f..cca8953 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java
@@ -85,7 +85,7 @@ public class ManageBackupBucketMessage extends PartitionMessage {
   }
 
   @Override
-  final public int getProcessorType() {
+  public int getProcessorType() {
     return DistributionManager.WAITING_POOL_EXECUTOR;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java
index 7b91cad..7e84404 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java
@@ -80,7 +80,7 @@ public class ManageBucketMessage extends PartitionMessage {
   }
 
   @Override
-  final public int getProcessorType() {
+  public int getProcessorType() {
     return DistributionManager.WAITING_POOL_EXECUTOR;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java
index 3e734c6..35e36b9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java
@@ -93,7 +93,7 @@ public class PRTombstoneMessage extends PartitionMessageWithDirectReply
   }
 
   @Override
-  protected final boolean operateOnPartitionedRegion(final DistributionManager dm,
+  protected boolean operateOnPartitionedRegion(final DistributionManager dm,
       PartitionedRegion r, long startTime) throws ForceReattemptException {
     if (logger.isTraceEnabled(LogMarker.DM)) {
       logger.debug("PRTombstoneMessage operateOnRegion: {}", r.getFullPath());

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
index 5129044..6b59f51 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
@@ -227,7 +227,7 @@ public abstract class PartitionMessage extends DistributionMessage
    * @return the compact value that will be sent which represents the PartitionedRegion
    * @see PartitionedRegion#getPRId()
    */
-  public final int getRegionId() {
+  public int getRegionId() {
     return regionId;
   }
 
@@ -236,7 +236,7 @@ public abstract class PartitionMessage extends DistributionMessage
    *         is required.
    */
   @Override
-  public final int getProcessorId() {
+  public int getProcessorId() {
     return this.processorId;
   }
 
@@ -244,7 +244,7 @@ public abstract class PartitionMessage extends DistributionMessage
    * @param processorId1 the {@link org.apache.geode.distributed.internal.ReplyProcessor21} id
    *        associated with the message, null if no acknowlegement is required.
    */
-  public final void registerProcessor(int processorId1) {
+  public void registerProcessor(int processorId1) {
     this.processorId = processorId1;
   }
 
@@ -677,7 +677,7 @@ public abstract class PartitionMessage extends DistributionMessage
   /**
    * @return the txUniqId
    */
-  public final int getTXUniqId() {
+  public int getTXUniqId() {
     return txUniqId;
   }
 
@@ -694,7 +694,7 @@ public abstract class PartitionMessage extends DistributionMessage
     return true;
   }
 
-  protected final boolean _mayAddToMultipleSerialGateways(DistributionManager dm) {
+  protected boolean _mayAddToMultipleSerialGateways(DistributionManager dm) {
     try {
       PartitionedRegion pr = PartitionedRegion.getPRFromId(this.regionId);
       if (pr == null) {
@@ -786,7 +786,7 @@ public abstract class PartitionMessage extends DistributionMessage
      * @throws ForceReattemptException if the recipient left the distributed system before the
      *         response was received.
      */
-    final public void waitForCacheException()
+    public void waitForCacheException()
         throws CacheException, ForceReattemptException, PrimaryBucketException {
       try {
         waitForRepliesUninterruptibly();

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage.java
index f7ca7e6..2a37afc 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage.java
@@ -66,7 +66,7 @@ public class PartitionedRegionFunctionStreamingMessage extends PartitionMessage
   }
 
   @Override
-  final public int getProcessorType() {
+  public int getProcessorType() {
     return DistributionManager.REGION_FUNCTION_EXECUTION_EXECUTOR;
   }