http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
index 870e778..44171e6 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
@@ -224,8 +224,8 @@ public class DistributedRegionFunctionStreamingMessage 
extends DistributionMessa
     }
   }
 
-  protected final boolean operateOnDistributedRegion(final DistributionManager 
dm,
-      DistributedRegion r) throws ForceReattemptException {
+  protected boolean operateOnDistributedRegion(final DistributionManager dm, 
DistributedRegion r)
+      throws ForceReattemptException {
     if (this.functionObject == null) {
       ReplyMessage.send(getSender(), this.processorId,
           new ReplyException(new FunctionException(

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
index 42bf10f..e236f80 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
@@ -12,7 +12,6 @@
  * or implied. See the License for the specific language governing permissions 
and limitations under
  * the License.
  */
-
 package org.apache.geode.internal.cache;
 
 import java.io.DataInput;
@@ -21,7 +20,6 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Set;
 
 import org.apache.logging.log4j.Logger;
@@ -41,7 +39,6 @@ import org.apache.geode.internal.ByteArrayDataInput;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.Version;
 import 
org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
-import 
org.apache.geode.internal.cache.DistributedPutAllOperation.PutAllEntryData;
 import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
 import org.apache.geode.internal.cache.ha.ThreadIdentifier;
 import org.apache.geode.internal.cache.partitioned.PutAllPRMessage;
@@ -59,13 +56,12 @@ import 
org.apache.geode.internal.offheap.annotations.Unretained;
 
 /**
  * Handles distribution of a Region.removeAll operation.
+ *
+ * TODO: extend DistributedCacheOperation instead of AbstractUpdateOperation
  * 
  * @since GemFire 8.1
  */
-public class DistributedRemoveAllOperation extends AbstractUpdateOperation // 
TODO extend
-                                                                           // 
DistributedCacheOperation
-                                                                           // 
instead
-{
+public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
   private static final Logger logger = LogService.getLogger();
 
   /**
@@ -247,7 +243,7 @@ public class DistributedRemoveAllOperation extends 
AbstractUpdateOperation // TO
     }
   }
 
-  public final EntryEventImpl getBaseEvent() {
+  public EntryEventImpl getBaseEvent() {
     return getEvent();
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/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 1d65579..3048e52 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
@@ -307,7 +307,7 @@ public abstract class ExpiryTask extends 
SystemTimer.SystemTimerTask {
    * whenever we try to schedule more expiration tasks.
    */
   @Override
-  public final void run2() {
+  public void run2() {
     try {
       if (executor != null) {
         executor.execute(new Runnable() {

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index 4ed583a..c813a80 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -4317,7 +4317,7 @@ public class GemFireCacheImpl implements InternalCache, 
InternalClientCache, Has
   }
 
   @Override
-  public final InternalResourceManager getInternalResourceManager() {
+  public InternalResourceManager getInternalResourceManager() {
     return getInternalResourceManager(true);
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/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 8d28a53..f2be3c0 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
@@ -271,24 +271,24 @@ public abstract class GridAdvisor extends 
DistributionAdvisor {
       finishInit();
     }
 
-    public final void setHost(String host) {
+    public void setHost(String host) {
       this.host = host;
     }
 
-    public final void setPort(int port) {
+    public void setPort(int port) {
       this.port = port;
     }
 
-    public final String getHost() {
+    public String getHost() {
       return this.host;
     }
 
-    public final int getPort() {
+    public int getPort() {
       return this.port;
     }
 
     @Override
-    public final ProfileId getId() {
+    public ProfileId getId() {
       if (this.id == null)
         throw new IllegalStateException("profile id not yet initialized");
       return this.id;
@@ -300,7 +300,7 @@ public abstract class GridAdvisor extends 
DistributionAdvisor {
      * 
      * @since GemFire 5.7
      */
-    protected final void tellLocalControllers(boolean removeProfile, boolean 
exchangeProfiles,
+    protected void tellLocalControllers(boolean removeProfile, boolean 
exchangeProfiles,
         final List<Profile> replyProfiles) {
       final List<Locator> locators = Locator.getLocators();
       for (int i = 0; i < locators.size(); i++) {
@@ -325,7 +325,7 @@ public abstract class GridAdvisor extends 
DistributionAdvisor {
      * 
      * @since GemFire 5.7
      */
-    protected final void tellLocalBridgeServers(boolean removeProfile, boolean 
exchangeProfiles,
+    protected void tellLocalBridgeServers(boolean removeProfile, boolean 
exchangeProfiles,
         final List<Profile> replyProfiles) {
       final InternalCache cache = GemFireCacheImpl.getInstance();
       if (cache != null && !cache.isClosed()) {

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
index fb5f0cf..82df980 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
@@ -1515,7 +1515,7 @@ public class InitialImageOperation {
     }
 
     @Override
-    final public int getProcessorType() {
+    public int getProcessorType() {
       return this.targetReinitialized ? 
DistributionManager.WAITING_POOL_EXECUTOR
           : DistributionManager.HIGH_PRIORITY_EXECUTOR;
     }
@@ -2160,7 +2160,7 @@ public class InitialImageOperation {
     }
 
     @Override
-    final public int getProcessorType() {
+    public int getProcessorType() {
       return DistributionManager.HIGH_PRIORITY_EXECUTOR;
     }
 
@@ -2431,7 +2431,7 @@ public class InitialImageOperation {
     }
 
     @Override
-    final public int getProcessorType() {
+    public int getProcessorType() {
       return this.targetReinitialized ? 
DistributionManager.WAITING_POOL_EXECUTOR
           : DistributionManager.HIGH_PRIORITY_EXECUTOR;
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java
index 3a0bf8e..617001f 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java
@@ -375,7 +375,7 @@ public class MemberFunctionStreamingMessage extends 
DistributionMessage
     return this.txUniqId;
   }
 
-  public final InternalDistributedMember getMemberToMasqueradeAs() {
+  public InternalDistributedMember getMemberToMasqueradeAs() {
     if (txMemberId == null) {
       return getSender();
     } else {

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
index 805b900..a6bb959 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions 
and limitations under
  * the License.
  */
-/**
- * 
- */
 package org.apache.geode.internal.cache;
 
 import java.io.DataInput;
@@ -40,6 +37,7 @@ import org.apache.geode.internal.cache.versions.VersionTag;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
 public class NonLocalRegionEntry implements RegionEntry, VersionStamp {
+
   private long lastModified;
   private boolean isRemoved;
   private Object key;
@@ -291,7 +289,7 @@ public class NonLocalRegionEntry implements RegionEntry, 
VersionStamp {
             .toLocalizedString());
   }
 
-  public final Object getValueInVM(RegionEntryContext context) {
+  public Object getValueInVM(RegionEntryContext context) {
     return this.value;
   }
 
@@ -360,7 +358,7 @@ public class NonLocalRegionEntry implements RegionEntry, 
VersionStamp {
     return false;
   }
 
-  public final Object getValueInVMOrDiskWithoutFaultIn(LocalRegion owner) {
+  public Object getValueInVMOrDiskWithoutFaultIn(LocalRegion owner) {
     return this.value;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/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 b171a95..037bff6 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
@@ -252,16 +252,6 @@ public class PartitionedRegionDataStore implements 
HasCachePerfStats {
     return numPrimaries.get();
   }
 
-
-  /**
-   * Indicates if this data store is managing buckets
-   * 
-   * @return true if it is managing buckets
-   */
-  final boolean isManagingAnyBucket() {
-    return !this.localBucket2RegionMap.isEmpty();
-  }
-
   /**
    * Try to grab buckets for all the colocated regions /* In case we can't 
grab buckets there is no
    * going back
@@ -872,55 +862,20 @@ public class PartitionedRegionDataStore implements 
HasCachePerfStats {
             event.getRegion().getFullPath(), event.getKey(), 
event.getDistributedMember());
       }
 
-      public final void afterRegionInvalidate(RegionEvent event) {}
+      public void afterRegionInvalidate(RegionEvent event) {}
 
-      public final void afterRegionDestroy(RegionEvent event) {}
+      public void afterRegionDestroy(RegionEvent event) {}
 
-      public final void afterRegionClear(RegionEvent event) {}
+      public void afterRegionClear(RegionEvent event) {}
 
-      public final void afterRegionCreate(RegionEvent event) {}
+      public void afterRegionCreate(RegionEvent event) {}
 
-      public final void afterRegionLive(RegionEvent event) {}
+      public void afterRegionLive(RegionEvent event) {}
 
-      public final void close() {}
+      public void close() {}
     };
   }
 
-  // private void addBucketMapping(Integer bucketId, Node theNode)
-  // {
-  // VersionedArrayList list = (VersionedArrayList)this.partitionedRegion
-  // .getBucket2Node().get(bucketId);
-  // // Create a new list to avoid concurrent modification exceptions when
-  // // the array list is serialized e.g. GII
-  // if (list == null) {
-  // list = new VersionedArrayList(
-  // this.partitionedRegion.getRedundantCopies() + 1);
-  // list.add(theNode);
-  //
-  // }
-  // else {
-  // for(Iterator itr =list.iterator(); itr.hasNext();) {
-  // Node nd = (Node)itr.next();
-  // if( !PartitionedRegionHelper.isMemberAlive(nd.getMemberId(),
-  // this.partitionedRegion.cache)
-  // && !this.partitionedRegion.isPresentInPRConfig(nd)) {
-  // list.remove(nd);
-  // if(list.size() ==0 ) {
-  // PartitionedRegionHelper.logForDataLoss(this.partitionedRegion,
-  // bucketId.intValue(), "addBucketMapping");
-  // }
-  // }
-  //
-  // }
-  // if (!list.contains(theNode)) {
-  // list.add(theNode);
-  // }
-  // }
-  // this.partitionedRegion.checkClosed();
-  // this.partitionedRegion.checkReadiness();
-  // this.partitionedRegion.getBucket2Node().put(bucketId, list);
-  // }
-
   public CacheLoader getCacheLoader() {
     return this.loader;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java
index 097ca41..a06c437 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java
@@ -28,10 +28,10 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
  * thrown away and a real DiskRegion instance will replace it. This class 
needs to keep track of any
  * information that can be recovered from the DiskInitFile.
  *
- *
  * @since GemFire prPersistSprint2
  */
 public class PlaceHolderDiskRegion extends AbstractDiskRegion implements 
DiskRecoveryStore {
+
   private final String name;
 
   /**
@@ -59,7 +59,7 @@ public class PlaceHolderDiskRegion extends AbstractDiskRegion 
implements DiskRec
   }
 
   @Override
-  public final String getName() {
+  public String getName() {
     return this.name;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/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 cfc9fdd..ab90a05 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
@@ -218,7 +218,7 @@ public class ProxyBucketRegion implements Bucket {
     return this.partitionedRegion.getAttributes();
   }
 
-  public final BucketAdvisor getBucketAdvisor() {
+  public BucketAdvisor getBucketAdvisor() {
     return this.advisor;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
index 913836a..0c141cc 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
@@ -12,7 +12,6 @@
  * or implied. See the License for the specific language governing permissions 
and limitations under
  * the License.
  */
-
 package org.apache.geode.internal.cache;
 
 import java.io.DataInput;
@@ -94,11 +93,6 @@ public class RemoteFetchEntryMessage extends 
RemoteOperationMessage {
     return p;
   }
 
-  // final public int getProcessorType()
-  // {
-  // return DistributionManager.PARTITIONED_REGION_EXECUTOR;
-  // }
-
   @Override
   public boolean isSevereAlertCompatible() {
     // allow forced-disconnect processing for all cache op messages
@@ -106,7 +100,7 @@ public class RemoteFetchEntryMessage extends 
RemoteOperationMessage {
   }
 
   @Override
-  protected final boolean operateOnRegion(DistributionManager dm, LocalRegion 
r, long startTime)
+  protected boolean operateOnRegion(DistributionManager dm, LocalRegion r, 
long startTime)
       throws RemoteOperationException {
     // RemoteFetchEntryMessage is used in refreshing client caches during 
interest list recovery,
     // so don't be too verbose or hydra tasks may time out

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/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 0e9f8c5..f029c31 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
@@ -55,7 +55,6 @@ import 
org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
 import org.apache.geode.internal.cache.versions.VersionTag;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.offheap.annotations.Released;
 
@@ -232,7 +231,7 @@ public class RemotePutAllMessage extends 
RemoteOperationMessageWithDirectReply {
   }
 
   @Override
-  public final void fromData(DataInput in) throws IOException, 
ClassNotFoundException {
+  public void fromData(DataInput in) throws IOException, 
ClassNotFoundException {
     super.fromData(in);
     this.eventId = (EventID) DataSerializer.readObject(in);
     this.callbackArg = DataSerializer.readObject(in);

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/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 d4d4c26..4b51705 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
@@ -225,7 +225,7 @@ public class RemoteRemoveAllMessage extends 
RemoteOperationMessageWithDirectRepl
   }
 
   @Override
-  public final void fromData(DataInput in) throws IOException, 
ClassNotFoundException {
+  public void fromData(DataInput in) throws IOException, 
ClassNotFoundException {
     super.fromData(in);
     this.eventId = (EventID) DataSerializer.readObject(in);
     this.callbackArg = DataSerializer.readObject(in);

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
index 3ad1137..e093d95 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
@@ -303,7 +303,7 @@ public class StateFlushOperation {
     }
 
     @Override
-    final public int getProcessorType() {
+    public int getProcessorType() {
       return processorType;
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
index 95c2cc2..8acc63b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
@@ -12,7 +12,6 @@
  * or implied. See the License for the specific language governing permissions 
and limitations under
  * the License.
  */
-
 package org.apache.geode.internal.cache;
 
 import org.apache.geode.cache.*;
@@ -20,14 +19,12 @@ import java.util.*;
 import org.apache.geode.internal.offheap.Releasable;
 
 /**
- * <p>
  * The internal implementation of the {@link TransactionEvent} interface
- * 
  *
  * @since GemFire 4.0
- * 
  */
 public class TXEvent implements TransactionEvent, Releasable {
+
   private final TXStateInterface localTxState;
   private List events;
   private List createEvents = null;
@@ -147,7 +144,7 @@ public class TXEvent implements TransactionEvent, 
Releasable {
     return true;
   }
 
-  public final Cache getCache() {
+  public Cache getCache() {
     return this.cache;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
index 32fe284..ffc0758 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
@@ -12,7 +12,6 @@
  * or implied. See the License for the specific language governing permissions 
and limitations under
  * the License.
  */
-
 package org.apache.geode.internal.cache;
 
 import org.apache.geode.internal.ExternalizableDSFID;
@@ -25,16 +24,15 @@ import org.apache.geode.distributed.internal.membership.*;
 
 /**
  * The implementation of the {@link TransactionId} interface stored in the 
transaction state and
- * used, amoung other things, to uniquely identify a transaction in a 
confederation of transaction
+ * used, among other things, to uniquely identify a transaction in a 
confederation of transaction
  * participants (currently VM in a Distributed System).
  *
- * 
  * @since GemFire 4.0
- * 
  * @see TXManagerImpl#begin
  * @see org.apache.geode.cache.CacheTransactionManager#getTransactionId
  */
 public class TXId extends ExternalizableDSFID implements TransactionId {
+
   /** The domain of a transaction, currently the VM's unique identifier */
   private InternalDistributedMember memberId;
   /** Per unique identifier within the transactions memberId */
@@ -104,7 +102,7 @@ public class TXId extends ExternalizableDSFID implements 
TransactionId {
     this.memberId = DSFIDFactory.readInternalDistributedMember(in);
   }
 
-  public static final TXId createFromData(DataInput in) throws IOException, 
ClassNotFoundException {
+  public static TXId createFromData(DataInput in) throws IOException, 
ClassNotFoundException {
     TXId result = new TXId();
     InternalDataSerializer.invokeFromData(result, in);
     return result;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
index 24cbaa2..2e991e6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
@@ -185,7 +185,7 @@ public abstract class TXMessage extends 
SerialDistributionMessage
     this.txMemberId = DataSerializer.readObject(in);
   }
 
-  public final InternalDistributedMember getMemberToMasqueradeAs() {
+  public InternalDistributedMember getMemberToMasqueradeAs() {
     if (txMemberId == null) {
       return getSender();
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/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 6a6e9ad..2c8c28b 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
@@ -12,7 +12,6 @@
  * or implied. See the License for the specific language governing permissions 
and limitations under
  * the License.
  */
-
 package org.apache.geode.internal.cache;
 
 import java.util.ArrayList;
@@ -32,7 +31,6 @@ import javax.transaction.Status;
 import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.CancelException;
-import org.apache.geode.InternalGemFireException;
 import org.apache.geode.SystemFailure;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CommitConflictException;
@@ -68,9 +66,7 @@ import org.apache.geode.internal.offheap.annotations.Retained;
  * TXState is the entity that tracks the transaction state on a per thread 
basis, noting changes to
  * Region entries on a per operation basis. It lives on the node where 
transaction data exists.
  *
- * 
  * @since GemFire 4.0
- * 
  * @see TXManagerImpl
  */
 public class TXState implements TXStateInterface {
@@ -1204,16 +1200,6 @@ public class TXState implements TXStateInterface {
     return readRegion(localRegion);
   }
 
-
-  final TXEntryState txWriteEntry(LocalRegion region, EntryEventImpl event, 
boolean ifNew,
-      boolean requireOldValue) {
-    try {
-      return txWriteEntry(region, event, ifNew, requireOldValue, null);
-    } catch (EntryNotFoundException e) {
-      throw new InternalGemFireException("caught unexpected exception", e);
-    }
-  }
-
   /**
    * @param requireOldValue if true set the old value in the event, even if 
ifNew and entry doesn't
    *        currently exist (this is needed for putIfAbsent).

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java
index 5dd624b..6055705 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions 
and limitations under
  * the License.
  */
-/**
- * File comment
- */
 package org.apache.geode.internal.cache;
 
 import java.util.Collection;
@@ -46,10 +43,9 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
 /**
  * TXStateStub lives on the accessor node when we are remoting a transaction. 
It is a stub for
  * {@link TXState}.
- * 
- *
  */
 public abstract class TXStateStub implements TXStateInterface {
+
   protected final DistributedMember target;
   protected final TXStateProxy proxy;
   protected Runnable internalAfterSendRollback;
@@ -57,11 +53,6 @@ public abstract class TXStateStub implements 
TXStateInterface {
 
   Map<Region<?, ?>, TXRegionStub> regionStubs = new HashMap<Region<?, ?>, 
TXRegionStub>();
 
-
-  /**
-   * @param stateProxy
-   * @param target
-   */
   protected TXStateStub(TXStateProxy stateProxy, DistributedMember target) {
     this.target = target;
     this.proxy = stateProxy;
@@ -113,8 +104,6 @@ public abstract class TXStateStub implements 
TXStateInterface {
     }
   }
 
-
-
   /**
    * Get or create a TXRegionStub for the given region. For regions that are 
new to the tx, we
    * validate their eligibility.
@@ -122,7 +111,7 @@ public abstract class TXStateStub implements 
TXStateInterface {
    * @param region The region to involve in the tx.
    * @return existing or new stub for region
    */
-  protected final TXRegionStub getTXRegionStub(LocalRegion region) {
+  protected TXRegionStub getTXRegionStub(LocalRegion region) {
     TXRegionStub stub = regionStubs.get(region);
     if (stub == null) {
       /*
@@ -139,7 +128,6 @@ public abstract class TXStateStub implements 
TXStateInterface {
     return this.regionStubs;
   }
 
-
   @Override
   public String toString() {
     StringBuilder builder = new StringBuilder();

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeap.java
index 3c0dd9b..b53d498 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
 import java.util.UUID;
 
 public abstract class VMStatsDiskLRURegionEntryHeap extends 
VMStatsDiskLRURegionEntry {
+
   public VMStatsDiskLRURegionEntryHeap(RegionEntryContext context, Object 
value) {
     super(context, value);
   }
@@ -29,7 +30,7 @@ public abstract class VMStatsDiskLRURegionEntryHeap extends 
VMStatsDiskLRURegion
   }
 
   private static class VMStatsDiskLRURegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VMStatsDiskLRURegionEntryHeap extends 
VMStatsDiskLRURegion
       return new VMStatsDiskLRURegionEntryHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMStatsDiskLRURegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeap.java
index d8f5083..c14b15a 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VMStatsDiskLRURegionEntryOffHeap extends 
VMStatsDiskLRURegionEntry
     implements OffHeapRegionEntry {
+
   public VMStatsDiskLRURegionEntryOffHeap(RegionEntryContext context, Object 
value) {
     super(context, value);
   }
@@ -30,7 +31,7 @@ public abstract class VMStatsDiskLRURegionEntryOffHeap 
extends VMStatsDiskLRUReg
   }
 
   private static class VMStatsDiskLRURegionEntryOffHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VMStatsDiskLRURegionEntryOffHeap 
extends VMStatsDiskLRUReg
       return new VMStatsDiskLRURegionEntryOffHeapObjectKey(context, key, 
value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMStatsDiskLRURegionEntryOffHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeap.java
index c193444..554268a 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
 import java.util.UUID;
 
 public abstract class VMStatsDiskRegionEntryHeap extends 
VMStatsDiskRegionEntry {
+
   public VMStatsDiskRegionEntryHeap(RegionEntryContext context, Object value) {
     super(context, value);
   }
@@ -29,7 +30,7 @@ public abstract class VMStatsDiskRegionEntryHeap extends 
VMStatsDiskRegionEntry
   }
 
   private static class VMStatsDiskRegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VMStatsDiskRegionEntryHeap extends 
VMStatsDiskRegionEntry
       return new VMStatsDiskRegionEntryHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMStatsDiskRegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeap.java
index 9ec129f..cfe8fef 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VMStatsDiskRegionEntryOffHeap extends 
VMStatsDiskRegionEntry
     implements OffHeapRegionEntry {
+
   public VMStatsDiskRegionEntryOffHeap(RegionEntryContext context, Object 
value) {
     super(context, value);
   }
@@ -30,7 +31,7 @@ public abstract class VMStatsDiskRegionEntryOffHeap extends 
VMStatsDiskRegionEnt
   }
 
   private static class VMStatsDiskRegionEntryOffHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -55,7 +56,7 @@ public abstract class VMStatsDiskRegionEntryOffHeap extends 
VMStatsDiskRegionEnt
       return new VMStatsDiskRegionEntryOffHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMStatsDiskRegionEntryOffHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeap.java
index 16c1013..1d474fa 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
 import java.util.UUID;
 
 public abstract class VMStatsLRURegionEntryHeap extends VMStatsLRURegionEntry {
+
   public VMStatsLRURegionEntryHeap(RegionEntryContext context, Object value) {
     super(context, value);
   }
@@ -29,7 +30,7 @@ public abstract class VMStatsLRURegionEntryHeap extends 
VMStatsLRURegionEntry {
   }
 
   private static class VMStatsLRURegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VMStatsLRURegionEntryHeap extends 
VMStatsLRURegionEntry {
       return new VMStatsLRURegionEntryHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMStatsLRURegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeap.java
index 52d7f6f..95487d0 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VMStatsLRURegionEntryOffHeap extends 
VMStatsLRURegionEntry
     implements OffHeapRegionEntry {
+
   public VMStatsLRURegionEntryOffHeap(RegionEntryContext context, Object 
value) {
     super(context, value);
   }
@@ -30,7 +31,7 @@ public abstract class VMStatsLRURegionEntryOffHeap extends 
VMStatsLRURegionEntry
   }
 
   private static class VMStatsLRURegionEntryOffHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -55,7 +56,7 @@ public abstract class VMStatsLRURegionEntryOffHeap extends 
VMStatsLRURegionEntry
       return new VMStatsLRURegionEntryOffHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMStatsLRURegionEntryOffHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeap.java
index ce3641b..082b645 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
 import java.util.UUID;
 
 public abstract class VMStatsRegionEntryHeap extends VMStatsRegionEntry {
+
   public VMStatsRegionEntryHeap(RegionEntryContext context, Object value) {
     super(context, value);
   }
@@ -28,7 +29,7 @@ public abstract class VMStatsRegionEntryHeap extends 
VMStatsRegionEntry {
   }
 
   private static class VMStatsRegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -53,7 +54,7 @@ public abstract class VMStatsRegionEntryHeap extends 
VMStatsRegionEntry {
       return new VMStatsRegionEntryHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMStatsRegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeap.java
index 1689a8f..03fd31d 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VMStatsRegionEntryOffHeap extends VMStatsRegionEntry
     implements OffHeapRegionEntry {
+
   public VMStatsRegionEntryOffHeap(RegionEntryContext context, Object value) {
     super(context, value);
   }
@@ -30,7 +31,7 @@ public abstract class VMStatsRegionEntryOffHeap extends 
VMStatsRegionEntry
   }
 
   private static class VMStatsRegionEntryOffHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -55,7 +56,7 @@ public abstract class VMStatsRegionEntryOffHeap extends 
VMStatsRegionEntry
       return new VMStatsRegionEntryOffHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMStatsRegionEntryOffHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeap.java
index 24bd9f4..56d5414 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
 import java.util.UUID;
 
 public abstract class VMThinDiskLRURegionEntryHeap extends 
VMThinDiskLRURegionEntry {
+
   public VMThinDiskLRURegionEntryHeap(RegionEntryContext context, Object 
value) {
     super(context, value);
   }
@@ -29,7 +30,7 @@ public abstract class VMThinDiskLRURegionEntryHeap extends 
VMThinDiskLRURegionEn
   }
 
   private static class VMThinDiskLRURegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VMThinDiskLRURegionEntryHeap extends 
VMThinDiskLRURegionEn
       return new VMThinDiskLRURegionEntryHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMThinDiskLRURegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeap.java
index 20a4127..c9d2eca 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VMThinDiskLRURegionEntryOffHeap extends 
VMThinDiskLRURegionEntry
     implements OffHeapRegionEntry {
+
   public VMThinDiskLRURegionEntryOffHeap(RegionEntryContext context, Object 
value) {
     super(context, value);
   }
@@ -30,7 +31,7 @@ public abstract class VMThinDiskLRURegionEntryOffHeap extends 
VMThinDiskLRURegio
   }
 
   private static class VMThinDiskLRURegionEntryOffHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VMThinDiskLRURegionEntryOffHeap extends 
VMThinDiskLRURegio
       return new VMThinDiskLRURegionEntryOffHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMThinDiskLRURegionEntryOffHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeap.java
index 27b5a5a..6018f50 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
 import java.util.UUID;
 
 public abstract class VMThinDiskRegionEntryHeap extends VMThinDiskRegionEntry {
+
   public VMThinDiskRegionEntryHeap(RegionEntryContext context, Object value) {
     super(context, value);
   }
@@ -29,7 +30,7 @@ public abstract class VMThinDiskRegionEntryHeap extends 
VMThinDiskRegionEntry {
   }
 
   private static class VMThinDiskRegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VMThinDiskRegionEntryHeap extends 
VMThinDiskRegionEntry {
       return new VMThinDiskRegionEntryHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMThinDiskRegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeap.java
index e900c2c..60c1628 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VMThinDiskRegionEntryOffHeap extends 
VMThinDiskRegionEntry
     implements OffHeapRegionEntry {
+
   public VMThinDiskRegionEntryOffHeap(RegionEntryContext context, Object 
value) {
     super(context, value);
   }
@@ -30,7 +31,7 @@ public abstract class VMThinDiskRegionEntryOffHeap extends 
VMThinDiskRegionEntry
   }
 
   private static class VMThinDiskRegionEntryOffHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -55,7 +56,7 @@ public abstract class VMThinDiskRegionEntryOffHeap extends 
VMThinDiskRegionEntry
       return new VMThinDiskRegionEntryOffHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMThinDiskRegionEntryOffHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeap.java
index 44ba283..dacba73 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
 import java.util.UUID;
 
 public abstract class VMThinLRURegionEntryHeap extends VMThinLRURegionEntry {
+
   public VMThinLRURegionEntryHeap(RegionEntryContext context, Object value) {
     super(context, value);
   }
@@ -29,7 +30,7 @@ public abstract class VMThinLRURegionEntryHeap extends 
VMThinLRURegionEntry {
   }
 
   private static class VMThinLRURegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VMThinLRURegionEntryHeap extends 
VMThinLRURegionEntry {
       return new VMThinLRURegionEntryHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMThinLRURegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeap.java
index 9ed657d..9e6a611 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VMThinLRURegionEntryOffHeap extends VMThinLRURegionEntry
     implements OffHeapRegionEntry {
+
   public VMThinLRURegionEntryOffHeap(RegionEntryContext context, Object value) 
{
     super(context, value);
   }
@@ -30,7 +31,7 @@ public abstract class VMThinLRURegionEntryOffHeap extends 
VMThinLRURegionEntry
   }
 
   private static class VMThinLRURegionEntryOffHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -55,7 +56,7 @@ public abstract class VMThinLRURegionEntryOffHeap extends 
VMThinLRURegionEntry
       return new VMThinLRURegionEntryOffHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMThinLRURegionEntryOffHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeap.java
index 3666a0a..d995852 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeap.java
@@ -29,7 +29,7 @@ public abstract class VMThinRegionEntryHeap extends 
VMThinRegionEntry {
   }
 
   private static class VMThinRegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -54,7 +54,7 @@ public abstract class VMThinRegionEntryHeap extends 
VMThinRegionEntry {
       return new VMThinRegionEntryHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMThinRegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeap.java
index 6426df0..64c305e 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeap.java
@@ -31,7 +31,7 @@ public abstract class VMThinRegionEntryOffHeap extends 
VMThinRegionEntry
   }
 
   private static class VMThinRegionEntryOffHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -56,7 +56,7 @@ public abstract class VMThinRegionEntryOffHeap extends 
VMThinRegionEntry
       return new VMThinRegionEntryOffHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VMThinRegionEntryOffHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeap.java
index 6c7bc91..1f7b878 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VersionedStatsDiskLRURegionEntryHeap
     extends VersionedStatsDiskLRURegionEntry {
+
   public VersionedStatsDiskLRURegionEntryHeap(RegionEntryContext context, 
Object value) {
     super(context, value);
   }
@@ -30,7 +31,7 @@ public abstract class VersionedStatsDiskLRURegionEntryHeap
   }
 
   private static class VersionedStatsDiskLRURegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedStatsDiskLRURegionEntryHeap
       return new VersionedStatsDiskLRURegionEntryHeapObjectKey(context, key, 
value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VersionedStatsDiskLRURegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeap.java
index 8b38a2b..808a0e5 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VersionedStatsDiskLRURegionEntryOffHeap
     extends VersionedStatsDiskLRURegionEntry implements OffHeapRegionEntry {
+
   public VersionedStatsDiskLRURegionEntryOffHeap(RegionEntryContext context, 
Object value) {
     super(context, value);
   }
@@ -31,7 +32,7 @@ public abstract class VersionedStatsDiskLRURegionEntryOffHeap
 
   private static class VersionedStatsDiskLRURegionEntryOffHeapFactory
       implements RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -58,7 +59,7 @@ public abstract class VersionedStatsDiskLRURegionEntryOffHeap
       return new VersionedStatsDiskLRURegionEntryOffHeapObjectKey(context, 
key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VersionedStatsDiskLRURegionEntryOffHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeap.java
index c6bdf93..3e440ff 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
 import java.util.UUID;
 
 public abstract class VersionedStatsDiskRegionEntryHeap extends 
VersionedStatsDiskRegionEntry {
+
   public VersionedStatsDiskRegionEntryHeap(RegionEntryContext context, Object 
value) {
     super(context, value);
   }
@@ -29,7 +30,7 @@ public abstract class VersionedStatsDiskRegionEntryHeap 
extends VersionedStatsDi
   }
 
   private static class VersionedStatsDiskRegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -56,7 +57,7 @@ public abstract class VersionedStatsDiskRegionEntryHeap 
extends VersionedStatsDi
       return new VersionedStatsDiskRegionEntryHeapObjectKey(context, key, 
value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VersionedStatsDiskRegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeap.java
index d2f1dcf..b5e0395 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VersionedStatsDiskRegionEntryOffHeap extends 
VersionedStatsDiskRegionEntry
     implements OffHeapRegionEntry {
+
   public VersionedStatsDiskRegionEntryOffHeap(RegionEntryContext context, 
Object value) {
     super(context, value);
   }
@@ -30,7 +31,7 @@ public abstract class VersionedStatsDiskRegionEntryOffHeap 
extends VersionedStat
   }
 
   private static class VersionedStatsDiskRegionEntryOffHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedStatsDiskRegionEntryOffHeap 
extends VersionedStat
       return new VersionedStatsDiskRegionEntryOffHeapObjectKey(context, key, 
value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VersionedStatsDiskRegionEntryOffHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeap.java
index 6978d51..c698e63 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
 import java.util.UUID;
 
 public abstract class VersionedStatsLRURegionEntryHeap extends 
VersionedStatsLRURegionEntry {
+
   public VersionedStatsLRURegionEntryHeap(RegionEntryContext context, Object 
value) {
     super(context, value);
   }
@@ -29,7 +30,7 @@ public abstract class VersionedStatsLRURegionEntryHeap 
extends VersionedStatsLRU
   }
 
   private static class VersionedStatsLRURegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -56,7 +57,7 @@ public abstract class VersionedStatsLRURegionEntryHeap 
extends VersionedStatsLRU
       return new VersionedStatsLRURegionEntryHeapObjectKey(context, key, 
value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VersionedStatsLRURegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeap.java
index f46bcbf..124d03a 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VersionedStatsLRURegionEntryOffHeap extends 
VersionedStatsLRURegionEntry
     implements OffHeapRegionEntry {
+
   public VersionedStatsLRURegionEntryOffHeap(RegionEntryContext context, 
Object value) {
     super(context, value);
   }
@@ -30,7 +31,7 @@ public abstract class VersionedStatsLRURegionEntryOffHeap 
extends VersionedStats
   }
 
   private static class VersionedStatsLRURegionEntryOffHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedStatsLRURegionEntryOffHeap 
extends VersionedStats
       return new VersionedStatsLRURegionEntryOffHeapObjectKey(context, key, 
value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VersionedStatsLRURegionEntryOffHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeap.java
index 55dc5ef..bc33c35 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
 import java.util.UUID;
 
 public abstract class VersionedStatsRegionEntryHeap extends 
VersionedStatsRegionEntry {
+
   public VersionedStatsRegionEntryHeap(RegionEntryContext context, Object 
value) {
     super(context, value);
   }
@@ -29,7 +30,7 @@ public abstract class VersionedStatsRegionEntryHeap extends 
VersionedStatsRegion
   }
 
   private static class VersionedStatsRegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VersionedStatsRegionEntryHeap extends 
VersionedStatsRegion
       return new VersionedStatsRegionEntryHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VersionedStatsRegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeap.java
index 2fe12c1..e272a5b 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VersionedStatsRegionEntryOffHeap extends 
VersionedStatsRegionEntry
     implements OffHeapRegionEntry {
+
   public VersionedStatsRegionEntryOffHeap(RegionEntryContext context, Object 
value) {
     super(context, value);
   }
@@ -30,7 +31,7 @@ public abstract class VersionedStatsRegionEntryOffHeap 
extends VersionedStatsReg
   }
 
   private static class VersionedStatsRegionEntryOffHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedStatsRegionEntryOffHeap 
extends VersionedStatsReg
       return new VersionedStatsRegionEntryOffHeapObjectKey(context, key, 
value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VersionedStatsRegionEntryOffHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeap.java
index 1eec3e9..af7c5cb 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
 import java.util.UUID;
 
 public abstract class VersionedThinDiskLRURegionEntryHeap extends 
VersionedThinDiskLRURegionEntry {
+
   public VersionedThinDiskLRURegionEntryHeap(RegionEntryContext context, 
Object value) {
     super(context, value);
   }
@@ -29,7 +30,7 @@ public abstract class VersionedThinDiskLRURegionEntryHeap 
extends VersionedThinD
   }
 
   private static class VersionedThinDiskLRURegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -56,7 +57,7 @@ public abstract class VersionedThinDiskLRURegionEntryHeap 
extends VersionedThinD
       return new VersionedThinDiskLRURegionEntryHeapObjectKey(context, key, 
value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VersionedThinDiskLRURegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeap.java
index e82a0aa..746ddc4 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VersionedThinDiskLRURegionEntryOffHeap extends 
VersionedThinDiskLRURegionEntry
     implements OffHeapRegionEntry {
+
   public VersionedThinDiskLRURegionEntryOffHeap(RegionEntryContext context, 
Object value) {
     super(context, value);
   }
@@ -30,7 +31,7 @@ public abstract class VersionedThinDiskLRURegionEntryOffHeap 
extends VersionedTh
   }
 
   private static class VersionedThinDiskLRURegionEntryOffHeapFactory 
implements RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedThinDiskLRURegionEntryOffHeap 
extends VersionedTh
       return new VersionedThinDiskLRURegionEntryOffHeapObjectKey(context, key, 
value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VersionedThinDiskLRURegionEntryOffHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeap.java
index 42d8564..bfa0428 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
 import java.util.UUID;
 
 public abstract class VersionedThinDiskRegionEntryHeap extends 
VersionedThinDiskRegionEntry {
+
   public VersionedThinDiskRegionEntryHeap(RegionEntryContext context, Object 
value) {
     super(context, value);
   }
@@ -29,7 +30,7 @@ public abstract class VersionedThinDiskRegionEntryHeap 
extends VersionedThinDisk
   }
 
   private static class VersionedThinDiskRegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -56,7 +57,7 @@ public abstract class VersionedThinDiskRegionEntryHeap 
extends VersionedThinDisk
       return new VersionedThinDiskRegionEntryHeapObjectKey(context, key, 
value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VersionedThinDiskRegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeap.java
index 4bdb7a4..3d47afe 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VersionedThinDiskRegionEntryOffHeap extends 
VersionedThinDiskRegionEntry
     implements OffHeapRegionEntry {
+
   public VersionedThinDiskRegionEntryOffHeap(RegionEntryContext context, 
Object value) {
     super(context, value);
   }
@@ -30,7 +31,7 @@ public abstract class VersionedThinDiskRegionEntryOffHeap 
extends VersionedThinD
   }
 
   private static class VersionedThinDiskRegionEntryOffHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedThinDiskRegionEntryOffHeap 
extends VersionedThinD
       return new VersionedThinDiskRegionEntryOffHeapObjectKey(context, key, 
value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VersionedThinDiskRegionEntryOffHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeap.java
index fb260be..49e205b 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
 import java.util.UUID;
 
 public abstract class VersionedThinLRURegionEntryHeap extends 
VersionedThinLRURegionEntry {
+
   public VersionedThinLRURegionEntryHeap(RegionEntryContext context, Object 
value) {
     super(context, value);
   }
@@ -29,7 +30,7 @@ public abstract class VersionedThinLRURegionEntryHeap extends 
VersionedThinLRURe
   }
 
   private static class VersionedThinLRURegionEntryHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -56,7 +57,7 @@ public abstract class VersionedThinLRURegionEntryHeap extends 
VersionedThinLRURe
       return new VersionedThinLRURegionEntryHeapObjectKey(context, key, value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VersionedThinLRURegionEntryHeapObjectKey.class;

http://git-wip-us.apache.org/repos/asf/geode/blob/f0218047/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeap.java
index 1286bb6..0aa2c5f 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
 
 public abstract class VersionedThinLRURegionEntryOffHeap extends 
VersionedThinLRURegionEntry
     implements OffHeapRegionEntry {
+
   public VersionedThinLRURegionEntryOffHeap(RegionEntryContext context, Object 
value) {
     super(context, value);
   }
@@ -30,7 +31,7 @@ public abstract class VersionedThinLRURegionEntryOffHeap 
extends VersionedThinLR
   }
 
   private static class VersionedThinLRURegionEntryOffHeapFactory implements 
RegionEntryFactory {
-    public final RegionEntry createEntry(RegionEntryContext context, Object 
key, Object value) {
+    public RegionEntry createEntry(RegionEntryContext context, Object key, 
Object value) {
       if (InlineKeyHelper.INLINE_REGION_KEYS) {
         Class<?> keyClass = key.getClass();
         if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedThinLRURegionEntryOffHeap 
extends VersionedThinLR
       return new VersionedThinLRURegionEntryOffHeapObjectKey(context, key, 
value);
     }
 
-    public final Class getEntryClass() {
+    public Class getEntryClass() {
       // The class returned from this method is used to estimate the memory 
size.
       // This estimate will not take into account the memory saved by inlining 
the keys.
       return VersionedThinLRURegionEntryOffHeapObjectKey.class;

Reply via email to