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:53 UTC

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

GEODE-2929: remove final from methods on internal classes


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/5abc4863
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/5abc4863
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/5abc4863

Branch: refs/heads/feature/GEODE-2929
Commit: 5abc486379f245b2371b476c712818b025465584
Parents: 30f455b
Author: Kirk Lund <kl...@apache.org>
Authored: Mon May 15 17:24:34 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon May 15 17:24:34 2017 -0700

----------------------------------------------------------------------
 .../admin/internal/AbstractHealthEvaluator.java |  4 +-
 .../internal/AdminDistributedSystemImpl.java    |  2 +-
 .../internal/DistributedSystemConfigImpl.java   |  2 +-
 .../geode/admin/internal/SystemMemberImpl.java  | 26 +++---
 .../geode/cache/client/internal/AbstractOp.java |  6 +-
 .../client/internal/ClientMetadataService.java  |  2 +-
 .../cache/client/internal/ConnectionStats.java  |  4 +-
 .../geode/cache/client/internal/PoolImpl.java   |  2 +-
 .../geode/cache/client/internal/PutOp.java      |  2 +-
 .../cache/client/internal/QueueStateImpl.java   |  6 +-
 .../cache/query/internal/ObjectIntHashMap.java  | 10 +--
 .../query/internal/QueryObserverHolder.java     |  6 +-
 .../geode/cache/query/internal/StructBag.java   |  8 +-
 .../geode/cache/query/internal/StructSet.java   |  4 +-
 .../query/internal/index/HashIndexSet.java      |  4 +-
 .../internal/AbstractDistributionConfig.java    |  2 +-
 .../internal/DistributionAdvisor.java           | 12 +--
 .../internal/DistributionMessage.java           |  6 +-
 .../internal/DistributionMessageObserver.java   |  4 +-
 .../FunctionExecutionPooledExecutor.java        |  4 +-
 .../internal/InternalDistributedSystem.java     | 12 +--
 .../distributed/internal/LocatorStats.java      | 16 ++--
 .../internal/PooledDistributionMessage.java     |  2 +-
 .../internal/PooledExecutorWithDMStats.java     |  4 +-
 .../internal/ReliableReplyProcessor21.java      |  4 +-
 .../distributed/internal/ReplyMessage.java      |  6 +-
 .../distributed/internal/ReplyProcessor21.java  | 14 ++--
 .../SerialQueuedExecutorWithDMStats.java        |  4 +-
 .../distributed/internal/ServerLocation.java    |  4 +-
 .../internal/direct/DirectChannel.java          |  2 +-
 .../internal/locks/DLockService.java            | 14 ++--
 .../distributed/internal/locks/ElderState.java  |  8 +-
 .../distributed/internal/locks/GrantorInfo.java | 12 +--
 .../internal/locks/GrantorRequestProcessor.java |  6 +-
 .../membership/InternalDistributedMember.java   |  4 +-
 .../membership/gms/messenger/JGAddress.java     |  8 +-
 .../membership/gms/mgr/LocalViewMessage.java    |  2 +-
 .../geode/internal/ByteArrayDataInput.java      | 42 +++++-----
 .../geode/internal/ByteBufferOutputStream.java  | 10 +--
 .../geode/internal/ExternalizableDSFID.java     |  4 +-
 .../geode/internal/GfeConsoleReaderFactory.java |  4 +-
 .../geode/internal/HeapDataOutputStream.java    | 64 +++++++--------
 .../geode/internal/InternalDataSerializer.java  |  6 +-
 .../geode/internal/NullDataOutputStream.java    | 26 +++---
 .../geode/internal/ObjIdConcurrentMap.java      |  4 +-
 .../org/apache/geode/internal/PureJavaMode.java |  6 +-
 .../java/org/apache/geode/internal/Version.java | 26 +++---
 .../internal/VersionedDataOutputStream.java     |  2 +-
 .../admin/remote/RemoteRegionAttributes.java    |  4 +-
 .../admin/statalerts/BaseDecoratorImpl.java     |  6 +-
 .../admin/statalerts/FunctionHelper.java        |  8 +-
 .../internal/cache/AbstractDiskRegion.java      |  8 +-
 .../internal/cache/AbstractLRURegionMap.java    | 34 ++++----
 .../geode/internal/cache/AbstractRegion.java    | 12 +--
 .../geode/internal/cache/AbstractRegionMap.java | 56 ++++++-------
 .../internal/cache/AbstractUpdateOperation.java |  2 +-
 .../geode/internal/cache/BucketAdvisor.java     |  8 +-
 .../geode/internal/cache/BucketRegion.java      |  4 +-
 .../cache/BytesAndBitsForCompactor.java         |  8 +-
 .../internal/cache/CacheObserverHolder.java     |  4 +-
 .../internal/cache/CacheServerLauncher.java     |  2 +-
 .../cache/ClientServerObserverHolder.java       |  4 +-
 .../internal/cache/DestroyRegionOperation.java  |  2 +-
 .../apache/geode/internal/cache/DiskRegion.java | 30 +++----
 .../geode/internal/cache/DiskStoreImpl.java     | 30 +++----
 .../internal/cache/DistPeerTXStateStub.java     |  4 +-
 .../cache/DistTXStateOnCoordinator.java         |  6 +-
 .../cache/DistributedCacheOperation.java        |  4 +-
 .../cache/DistributedClearOperation.java        |  2 +-
 .../cache/DistributedPutAllOperation.java       |  2 +-
 .../geode/internal/cache/DistributedRegion.java |  2 +-
 ...stributedRegionFunctionStreamingMessage.java |  4 +-
 .../cache/DistributedRemoveAllOperation.java    |  2 +-
 .../apache/geode/internal/cache/EntriesSet.java |  2 +-
 .../geode/internal/cache/EntryEventImpl.java    | 58 ++++++-------
 .../geode/internal/cache/EntryExpiryTask.java   |  2 +-
 .../internal/cache/EvictionAttributesImpl.java  |  4 +-
 .../apache/geode/internal/cache/ExpiryTask.java | 18 ++--
 .../FunctionStreamingOrderedReplyMessage.java   |  2 +-
 .../geode/internal/cache/GridAdvisor.java       |  6 +-
 .../apache/geode/internal/cache/HARegion.java   |  4 +-
 .../geode/internal/cache/InlineKeyHelper.java   |  2 +-
 .../apache/geode/internal/cache/KeyInfo.java    | 12 +--
 .../geode/internal/cache/LocalRegion.java       |  4 +-
 .../geode/internal/cache/OverflowOplogSet.java  | 14 ++--
 .../internal/cache/PartitionRegionConfig.java   |  8 +-
 .../cache/PartitionedRegionDataStore.java       | 16 ++--
 .../internal/cache/PartitionedRegionStats.java  |  2 +-
 .../internal/cache/PersistentOplogSet.java      | 10 +--
 .../apache/geode/internal/cache/PoolStats.java  | 18 ++--
 .../geode/internal/cache/ProxyBucketRegion.java |  4 +-
 .../geode/internal/cache/ProxyRegionMap.java    |  2 +-
 .../geode/internal/cache/RegionExpiryTask.java  | 18 ++--
 .../internal/cache/RegionIdleExpiryTask.java    |  2 +-
 .../internal/cache/RegionTTLExpiryTask.java     |  2 +-
 .../internal/cache/RemoteDestroyMessage.java    | 12 +--
 .../geode/internal/cache/RemoteGetMessage.java  |  2 +-
 .../internal/cache/RemotePutAllMessage.java     |  6 +-
 .../geode/internal/cache/RemotePutMessage.java  | 30 +++----
 .../internal/cache/RemoteRemoveAllMessage.java  |  6 +-
 .../apache/geode/internal/cache/TXEntry.java    |  4 +-
 .../geode/internal/cache/TXEntryState.java      | 40 ++++-----
 .../internal/cache/TXFarSideCMTracker.java      | 20 ++---
 .../geode/internal/cache/TXReservationMgr.java  |  2 +-
 .../apache/geode/internal/cache/TXState.java    |  2 +-
 .../geode/internal/cache/TXStateProxyImpl.java  |  6 +-
 .../org/apache/geode/internal/cache/Token.java  | 10 +--
 .../geode/internal/cache/UpdateOperation.java   |  2 +-
 .../geode/internal/cache/VMLRURegionMap.java    |  8 +-
 .../cache/control/HeapMemoryMonitor.java        |  2 +-
 .../cache/control/MemoryThresholds.java         |  2 +-
 .../cache/execute/AbstractExecution.java        | 20 ++---
 .../cache/execute/FunctionContextImpl.java      |  2 +-
 .../internal/cache/locks/TXLockIdImpl.java      |  4 +-
 .../internal/cache/lru/HeapLRUStatistics.java   |  4 +-
 .../internal/cache/lru/NewLRUClockHand.java     |  2 +-
 .../AllBucketProfilesUpdateMessage.java         |  2 +-
 .../partitioned/BecomePrimaryBucketMessage.java |  2 +-
 .../partitioned/BucketProfileUpdateMessage.java |  2 +-
 .../cache/partitioned/BucketSizeMessage.java    |  2 +-
 .../cache/partitioned/CreateBucketMessage.java  |  2 +-
 .../cache/partitioned/DestroyMessage.java       |  8 +-
 .../DestroyRegionOnDataStoreMessage.java        |  4 +-
 .../partitioned/EndBucketCreationMessage.java   |  2 +-
 .../internal/cache/partitioned/GetMessage.java  |  2 +-
 .../cache/partitioned/IndexCreationMsg.java     | 10 +--
 .../cache/partitioned/InterestEventMessage.java |  4 +-
 .../partitioned/ManageBackupBucketMessage.java  |  2 +-
 .../cache/partitioned/ManageBucketMessage.java  |  2 +-
 .../cache/partitioned/PRTombstoneMessage.java   |  2 +-
 .../cache/partitioned/PartitionMessage.java     | 12 +--
 ...rtitionedRegionFunctionStreamingMessage.java |  2 +-
 .../PartitionedRegionObserverHolder.java        |  4 +-
 .../internal/cache/partitioned/PutMessage.java  | 24 +++---
 .../cache/partitioned/RegionAdvisor.java        | 14 ++--
 .../cache/partitioned/RemoteSizeMessage.java    |  2 +-
 .../cache/partitioned/RemoveAllPRMessage.java   | 10 +--
 .../cache/partitioned/RemoveIndexesMessage.java | 10 +--
 .../cache/persistence/BytesAndBits.java         |  4 +-
 .../persistence/MembershipViewRequest.java      |  2 +-
 .../cache/tier/sockets/BaseCommand.java         |  2 +-
 .../tier/sockets/CacheClientNotifierStats.java  | 24 +++---
 .../tier/sockets/CacheClientProxyStats.java     |  4 +-
 .../internal/cache/tier/sockets/HandShake.java  |  2 +-
 .../internal/cache/tier/sockets/Message.java    |  2 +-
 .../geode/internal/cache/tier/sockets/Part.java |  4 +-
 .../tier/sockets/UnregisterAllInterest.java     |  2 +-
 .../cache/vmotion/VMotionObserverHolder.java    |  4 +-
 .../cache/wan/AbstractGatewaySender.java        | 14 ++--
 .../AbstractGatewaySenderEventProcessor.java    |  4 +-
 .../parallel/ParallelGatewaySenderQueue.java    | 12 +--
 .../wan/serial/SerialGatewaySenderQueue.java    |  8 +-
 .../geode/internal/cache/xmlcache/CacheXml.java | 16 ++--
 .../concurrent/CompactConcurrentHashSet2.java   | 66 +++++++--------
 .../geode/internal/logging/PureLogWriter.java   |  4 +-
 .../logging/log4j/LocalizedMessage.java         |  8 +-
 .../logging/log4j/LogWriterAppender.java        |  2 +-
 .../apache/geode/internal/offheap/DataType.java |  2 +-
 .../geode/internal/shared/NativeCalls.java      |  6 +-
 .../internal/shared/NativeCallsJNAImpl.java     |  2 +-
 .../internal/shared/NativeErrorException.java   |  2 +-
 .../apache/geode/internal/shared/OSType.java    |  2 +-
 .../statistics/AbstractStatisticsFactory.java   | 68 ++++++++--------
 .../statistics/DummyStatisticsImpl.java         | 80 +++++++++---------
 .../internal/statistics/GemFireStatSampler.java | 28 +++----
 .../internal/statistics/HostStatSampler.java    | 40 ++++-----
 .../statistics/LocalStatisticsImpl.java         | 26 +++---
 .../internal/statistics/SampleCollector.java    |  2 +-
 .../internal/statistics/SimpleStatisticId.java  |  4 +-
 .../internal/statistics/StatArchiveReader.java  |  2 +-
 .../internal/statistics/StatArchiveWriter.java  | 34 ++++----
 .../statistics/StatisticDescriptorImpl.java     | 34 ++++----
 .../internal/statistics/StatisticsImpl.java     | 86 ++++++++++----------
 .../statistics/StatisticsTypeFactoryImpl.java   |  4 +-
 .../internal/statistics/StatisticsTypeImpl.java | 10 +--
 .../statistics/platform/ProcessStats.java       |  4 +-
 .../stats50/Atomic50StatisticsImpl.java         | 50 ++++++------
 .../internal/tcp/ByteBufferInputStream.java     | 16 ++--
 .../apache/geode/internal/tcp/Connection.java   | 20 ++---
 .../geode/internal/tcp/MsgDestreamer.java       |  6 +-
 .../geode/internal/tcp/MsgOutputStream.java     | 34 ++++----
 .../apache/geode/internal/tcp/MsgStreamer.java  | 52 ++++++------
 .../internal/tcp/VersionedMsgStreamer.java      |  2 +-
 .../geode/internal/util/CollectionUtils.java    |  4 +-
 .../CustomEntryConcurrentHashMap.java           | 46 +++++------
 .../geode/management/cli/CommandService.java    |  4 +-
 .../geode/management/internal/AlertDetails.java |  2 +-
 .../management/internal/ArrayConverter.java     |  4 +-
 .../internal/CollectionConverter.java           |  4 +-
 .../management/internal/CompositeConverter.java |  4 +-
 .../management/internal/EnumConverter.java      |  4 +-
 .../management/internal/IdentityConverter.java  |  2 +-
 .../geode/management/internal/OpenMethod.java   | 12 +--
 .../management/internal/OpenTypeConverter.java  | 12 +--
 .../management/internal/TableConverter.java     |  4 +-
 .../internal/cli/commands/DeployCommands.java   |  8 +-
 .../internal/cli/commands/StatusCommands.java   |  2 +-
 .../configuration/domain/CacheElement.java      |  4 +-
 .../configuration/domain/XmlEntity.java         | 10 +--
 .../internal/configuration/utils/XmlUtils.java  | 14 ++--
 .../web/io/MultipartFileResourceAdapter.java    |  2 +-
 .../web/shell/AbstractHttpOperationInvoker.java |  6 +-
 .../shell/support/HttpInvocationHandler.java    |  4 +-
 .../pdx/ReflectionBasedAutoSerializer.java      | 10 +--
 .../pdx/internal/AutoSerializableManager.java   |  4 +-
 .../geode/redis/internal/RegionProvider.java    |  8 +-
 .../internal/executor/hll/HllExecutor.java      |  2 +-
 .../internal/executor/list/ListExecutor.java    |  2 +-
 .../executor/sortedset/ZRangeByLexExecutor.java |  2 +-
 .../executor/string/StringExecutor.java         |  2 +-
 .../security/GemFireSecurityException.java      |  6 +-
 .../cache/query/internal/cq/CqConflatable.java  | 18 ++--
 .../internal/locator/wan/LocatorDiscovery.java  |  2 +-
 213 files changed, 1104 insertions(+), 1104 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
index 57b42a8..14235b9 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
@@ -70,7 +70,7 @@ public abstract class AbstractHealthEvaluator {
    * @param status A list of {@link AbstractHealthEvaluator.HealthStatus HealthStatus} objects that
    *        is populated when ill health is detected.
    */
-  public final void evaluate(List status) {
+  public void evaluate(List status) {
     this.numEvaluations++;
     check(status);
   }
@@ -85,7 +85,7 @@ public abstract class AbstractHealthEvaluator {
   /**
    * Returns whether or not this is the first evaluation
    */
-  protected final boolean isFirstEvaluation() {
+  protected boolean isFirstEvaluation() {
     return this.numEvaluations <= 1;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
index ed0c015..9cd9ce3 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
@@ -1813,7 +1813,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
    *
    * @see #createGemFireHealth
    */
-  public final GemFireHealth getGemFireHealth() {
+  public GemFireHealth getGemFireHealth() {
     synchronized (this) {
       if (this.health == null || this.health.isClosed()) {
         try {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
index 7a75612..ae9f3c8 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
@@ -638,7 +638,7 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
   private static final String ILLEGAL_REMOTE_COMMAND_RSH_OR_SSH =
       "Allowed remote commands include \"rsh {HOST} {CMD}\" or \"ssh {HOST} {CMD}\" with valid rsh or ssh switches. Invalid: ";
 
-  private final void checkRemoteCommand(final String remoteCommand) {
+  private void checkRemoteCommand(final String remoteCommand) {
     if (remoteCommand == null || remoteCommand.isEmpty()) {
       return;
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
index 1e2d2a7..da09903 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
@@ -132,19 +132,19 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
     return new DistributionConfigImpl(props);
   }
 
-  public final AdminDistributedSystem getDistributedSystem() {
+  public AdminDistributedSystem getDistributedSystem() {
     return this.system;
   }
 
-  public final InternalDistributedMember getInternalId() {
+  public InternalDistributedMember getInternalId() {
     return internalId;
   }
 
-  public final String getId() {
+  public String getId() {
     return this.id;
   }
 
-  public final String getName() {
+  public String getName() {
     return this.name;
   }
 
@@ -152,7 +152,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
     return this.host;
   }
 
-  public final InetAddress getHostAddress() {
+  public InetAddress getHostAddress() {
     return InetAddressUtil.toInetAddress(this.getHost());
   }
 
@@ -160,7 +160,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
   // Operations
   // -------------------------------------------------------------------------
 
-  public final String getLog() {
+  public String getLog() {
     String childTail = null;
     String mainTail = null;
     GemFireVM vm = getGemFireVM();
@@ -189,14 +189,14 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
     }
   }
 
-  public final java.util.Properties getLicense() {
+  public java.util.Properties getLicense() {
     GemFireVM vm = getGemFireVM();
     if (vm == null)
       return null;
     return new Properties();
   }
 
-  public final String getVersion() {
+  public String getVersion() {
     GemFireVM vm = getGemFireVM();
     if (vm == null)
       return null;
@@ -220,7 +220,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
     return statsImpl;
   }
 
-  public final boolean hasCache() {
+  public boolean hasCache() {
     GemFireVM member = getGemFireVM();
     if (member == null) {
       return false;
@@ -230,7 +230,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
     }
   }
 
-  public final SystemMemberCache getCache() throws org.apache.geode.admin.AdminException {
+  public SystemMemberCache getCache() throws org.apache.geode.admin.AdminException {
     GemFireVM vm = getGemFireVM(); // fix for bug 33505
     if (vm == null)
       return null;
@@ -256,7 +256,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
    * Sets the value of this system member's distribution-related configuration based on the given
    * <code>Config</code> object.
    */
-  public final void refreshConfig(Config config) throws org.apache.geode.admin.AdminException {
+  public void refreshConfig(Config config) throws org.apache.geode.admin.AdminException {
     if (config == null) {
       throw new AdminException(
           LocalizedStrings.SystemMemberImpl_FAILED_TO_REFRESH_CONFIGURATION_PARAMETERS_FOR_0
@@ -285,7 +285,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
     }
   }
 
-  public final ConfigurationParameter[] getConfiguration() {
+  public ConfigurationParameter[] getConfiguration() {
     ConfigurationParameter[] array = new ConfigurationParameter[this.parms.size()];
     this.parms.values().toArray(array);
     return array;
@@ -368,7 +368,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
   /**
    * Returns the <code>GemFireVM</code> that underlies this <code>SystemMember</code>.
    */
-  protected final GemFireVM getGemFireVM() {
+  protected GemFireVM getGemFireVM() {
     return this.vm;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
index 180d31b..ed0b82c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AbstractOp.java
@@ -323,7 +323,7 @@ public abstract class AbstractOp implements Op {
    * @throws Exception if response could not be processed or we received a response with a server
    *         exception.
    */
-  protected final void processChunkedResponse(ChunkedMessage msg, String opName,
+  protected void processChunkedResponse(ChunkedMessage msg, String opName,
       ChunkHandler callback) throws Exception {
     msg.readHeader();
     final int msgType = msg.getMessageType();
@@ -392,11 +392,11 @@ public abstract class AbstractOp implements Op {
     }
   }
 
-  protected final boolean hasFailed() {
+  protected boolean hasFailed() {
     return this.failed;
   }
 
-  protected final boolean hasTimedOut() {
+  protected boolean hasTimedOut() {
     return this.timedOut;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
index ec4895f..1783e2f 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
@@ -539,7 +539,7 @@ public class ClientMetadataService {
     }
   }
 
-  public final void getClientPRMetadata(LocalRegion region) {
+  void getClientPRMetadata(LocalRegion region ) {
     final String regionFullPath = region.getFullPath();
     ClientPartitionAdvisor advisor = null;
     InternalPool pool = region.getServerProxy().getPool();

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
index d91719d..ba647c8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
@@ -3256,11 +3256,11 @@ public class ConnectionStats implements MessageStats {
     this.sendStats.close();
   }
 
-  public final void incReceivedBytes(long v) {
+  public void incReceivedBytes(long v) {
     this.stats.incLong(receivedBytesId, v);
   }
 
-  public final void incSentBytes(long v) {
+  public void incSentBytes(long v) {
     this.stats.incLong(sentBytesId, v);
     // if (this.gatewayStats != null) {
     // this.gatewayStats.incSentBytes(v);

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
index a436aed..882c7e6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
@@ -1310,7 +1310,7 @@ public class PoolImpl implements InternalPool {
 
   public static abstract class PoolTask implements Runnable {
 
-    public final void run() {
+    public void run() {
       try {
         run2();
       } catch (VirtualMachineError e) {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
index 906a2b3..447ed38 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
@@ -361,7 +361,7 @@ public class PutOp {
      *         exception.
      * @since GemFire 6.1
      */
-    private final void processAck(Message msg, String opName, Connection con) throws Exception {
+    private void processAck(Message msg, String opName, Connection con) throws Exception {
       final int msgType = msg.getMessageType();
       // Update delta stats
       if (this.deltaSent && this.region != null) {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java
index 7ada76f..2530472 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java
@@ -392,21 +392,21 @@ public class QueueStateImpl implements QueueState {
     /**
      * @return Returns the creationTime.
      */
-    public final long getCreationTime() {
+    public long getCreationTime() {
       return creationTime;
     }
 
     /**
      * @return Returns the sequenceId.
      */
-    public final long getSequenceId() {
+    public long getSequenceId() {
       return sequenceId;
     }
 
     /**
      * @return Returns the putAllSequenceId.
      */
-    public final long getPutAllSequenceId() {
+    public long getPutAllSequenceId() {
       return putAllSequenceId;
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
index ff794d6..d0cf5db 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
@@ -340,7 +340,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
    * Returns the entry associated with the specified key in the IntHashMap. Returns null if the
    * IntHashMap contains no mapping for the key.
    */
-  final Entry getEntry(Object key) {
+  Entry getEntry(Object key) {
     int hash = (key == null) ? 0 : hash(hashingStrategy.hashCode(key));
     for (Entry e = table[indexFor(hash, table.length)]; e != null; e = e.next) {
       Object k;
@@ -530,7 +530,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
    * Removes and returns the entry associated with the specified key in the IntHashMap. Returns null
    * if the IntHashMap contains no mapping for this key.
    */
-  final Entry removeEntryForKey(Object key) {
+  Entry removeEntryForKey(Object key) {
     int hash = (key == null) ? 0 : hash(hashingStrategy.hashCode(key));
     int i = indexFor(hash, table.length);
     Entry prev = table[i];
@@ -560,7 +560,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
   /**
    * Special version of remove for EntrySet.
    */
-  final Entry removeMapping(Object o) {
+  Entry removeMapping(Object o) {
     if (!(o instanceof Entry))
       return null;
 
@@ -850,11 +850,11 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
       }
     }
 
-    public final boolean hasNext() {
+    public boolean hasNext() {
       return next != null;
     }
 
-    final Entry nextEntry() {
+    Entry nextEntry() {
       if (modCount != expectedModCount)
         throw new ConcurrentModificationException();
       Entry e = next;

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverHolder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverHolder.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverHolder.java
index 93f848f..5bba736 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverHolder.java
@@ -49,7 +49,7 @@ public class QueryObserverHolder {
   /**
    * Set the given observer to be notified of query events. Returns the current observer.
    */
-  public static final QueryObserver setInstance(QueryObserver observer) {
+  public static QueryObserver setInstance(QueryObserver observer) {
     Support.assertArg(observer != null, "setInstance expects a non-null argument!");
     QueryObserver oldObserver = _instance;
     _instance = observer;
@@ -61,14 +61,14 @@ public class QueryObserverHolder {
   }
 
   /** Return the current QueryObserver instance */
-  public static final QueryObserver getInstance() {
+  public static QueryObserver getInstance() {
     return _instance;
   }
 
   /**
    * Only for test purposes.
    */
-  public static final void reset() {
+  public static void reset() {
     _instance = NO_OBSERVER;
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java
index 2e9697b..5db6e28 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java
@@ -52,12 +52,12 @@ public class StructBag extends ResultsBag implements StructFields {
    */
   protected static class ObjectArrayHashingStrategy implements HashingStrategy {
 
-    public final int hashCode(Object o) {
+    public int hashCode(Object o) {
       Object[] oa = (Object[]) o;
       return Arrays.deepHashCode(oa);
     }
 
-    public final boolean equals(Object o1, Object o2) {
+    public boolean equals(Object o1, Object o2) {
       if (o1 == null)
         return o2 == null;
       if (!(o1 instanceof Object[]) || !(o2 instanceof Object[])) {
@@ -73,7 +73,7 @@ public class StructBag extends ResultsBag implements StructFields {
   protected static class ObjectArrayFUHashingStrategy implements Hash.Strategy<Object> {
     private static final long serialVersionUID = 8975047264555337042L;
 
-    public final int hashCode(Object o) {
+    public int hashCode(Object o) {
       // throws ClassCastException if not Object[]
       // compute hash code based on all elements
       if (!(o instanceof Object[])) {
@@ -90,7 +90,7 @@ public class StructBag extends ResultsBag implements StructFields {
       return h;
     }
 
-    public final boolean equals(Object o1, Object o2) {
+    public boolean equals(Object o1, Object o2) {
       // throws ClassCastException if not Object[]
       if (o1 == null)
         return o2 == null;

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
index 7003d73..bbc6979 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
@@ -64,7 +64,7 @@ public class StructSet /* extends ObjectOpenCustomHashSet */ implements Set, Sel
   protected static class ObjectArrayHashingStrategy implements ObjectOpenCustomHashSet.Strategy {
     private static final long serialVersionUID = -6407549977968716071L;
 
-    public final int hashCode(Object o) {
+    public int hashCode(Object o) {
       // throws ClassCastException if not Object[]
       // compute hash code based on all elements
       Object[] oa = (Object[]) o;
@@ -77,7 +77,7 @@ public class StructSet /* extends ObjectOpenCustomHashSet */ implements Set, Sel
       return h;
     }
 
-    public final boolean equals(Object o1, Object o2) {
+    public boolean equals(Object o1, Object o2) {
       // throws ClassCastException if not Object[]
       if (o1 == null)
         return o2 == null;

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java
index eb21f97..d7304ea 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java
@@ -484,7 +484,7 @@ public class HashIndexSet implements Set {
     return false;
   }
 
-  public final boolean areObjectsEqual(Object o1, Object o2) {
+  public boolean areObjectsEqual(Object o1, Object o2) {
     if (o1 == null) {
       return o2 == null;
     }
@@ -671,7 +671,7 @@ public class HashIndexSet implements Set {
   /**
    * Before inserting we can ensure we have capacity
    */
-  protected final void preInsertHook() {
+  protected void preInsertHook() {
     if (hashIndexSetProperties.size > hashIndexSetProperties.maxSize
         || hashIndexSetProperties.free == 0 || TEST_ALWAYS_REHASH) {
       rehash(arraySize(hashIndexSetProperties.size + 1, _loadFactor));

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
index 2c6c025..01c6157 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
@@ -1241,7 +1241,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig
     return dcAttDescriptions;
   }
 
-  public static final InetAddress _getDefaultMcastAddress() {
+  public static InetAddress _getDefaultMcastAddress() {
     // Default MCast address can be just IPv4 address.
     // On IPv6 machines, JGroups converts IPv4 address to equivalent IPv6 address.
     String ipLiteral = "239.192.81.1";

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
index 1d3dc86..10c187c 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
@@ -372,7 +372,7 @@ public class DistributionAdvisor {
     return getAdvisee().getDistributionManager();
   }
 
-  public final DistributionAdvisee getAdvisee() {
+  public DistributionAdvisee getAdvisee() {
     return this.advisee;
   }
 
@@ -458,7 +458,7 @@ public class DistributionAdvisor {
   }
 
   // wait for pending profile exchange to complete before returning
-  public final boolean isInitialized() {
+  public boolean isInitialized() {
     synchronized (this.initializeLock) {
       return this.initialized;
     }
@@ -470,7 +470,7 @@ public class DistributionAdvisor {
    * 
    * @since GemFire 5.7
    */
-  public final boolean pollIsInitialized() {
+  public boolean pollIsInitialized() {
     return this.initialized;
   }
 
@@ -755,7 +755,7 @@ public class DistributionAdvisor {
    * @param version The membership version returned by startOperation
    * @since GemFire 5.1
    */
-  public final synchronized long endOperation(long version) {
+  public synchronized long endOperation(long version) {
     synchronized (this.opCountLock) {
       if (version == membershipVersion) {
         currentVersionOpCount--;
@@ -1182,7 +1182,7 @@ public class DistributionAdvisor {
    * @since GemFire 5.7
    */
   @SuppressWarnings("unchecked")
-  protected final Set<InternalDistributedMember> getDefaultDistributionMembers() {
+  protected Set<InternalDistributedMember> getDefaultDistributionMembers() {
     if (!useAdminMembersForDefault()) {
       return getDistributionManager().getOtherDistributionManagerIds();
     } else {
@@ -1622,7 +1622,7 @@ public class DistributionAdvisor {
      * @param removeProfile true to remove profile else add profile
      * @param exchangeProfiles true to add the profile to reply
      */
-    protected final void handleDistributionAdvisee(DistributionAdvisee advisee,
+    protected void handleDistributionAdvisee(DistributionAdvisee advisee,
         boolean removeProfile, boolean exchangeProfiles, final List<Profile> replyProfiles) {
       final DistributionAdvisor da;
       if (advisee != null && (da = advisee.getDistributionAdvisor()) != null) {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
index 69a5d90..403b420 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
@@ -144,7 +144,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
     return mask;
   }
 
-  public static final byte getNumBits(final int maxValue) {
+  public static byte getNumBits(final int maxValue) {
     byte numBits = 1;
     while ((1 << numBits) <= maxValue) {
       numBits++;
@@ -345,7 +345,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
   /**
    * Scheduled action to take when on this message when we are ready to process it.
    */
-  protected final void scheduleAction(final DistributionManager dm) {
+  protected void scheduleAction(final DistributionManager dm) {
     if (logger.isTraceEnabled(LogMarker.DM)) {
       logger.trace(LogMarker.DM, "Processing '{}'", this);
     }
@@ -411,7 +411,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
   /**
    * Schedule this message's process() method in a thread determined by getExecutor()
    */
-  protected final void schedule(final DistributionManager dm) {
+  protected void schedule(final DistributionManager dm) {
     boolean inlineProcess = DistributionManager.INLINE_PROCESS
         && getProcessorType() == DistributionManager.SERIAL_EXECUTOR && !isPreciousThread();
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java
index 35c0a2e..d48a689 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessageObserver.java
@@ -30,14 +30,14 @@ public abstract class DistributionMessageObserver {
    * @param instance
    * @return the old observer, or null if there was no old observer.
    */
-  public static final DistributionMessageObserver setInstance(
+  public static DistributionMessageObserver setInstance(
       DistributionMessageObserver instance) {
     DistributionMessageObserver oldInstance = DistributionMessageObserver.instance;
     DistributionMessageObserver.instance = instance;
     return oldInstance;
   }
 
-  public static final DistributionMessageObserver getInstance() {
+  public static DistributionMessageObserver getInstance() {
     return instance;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
index a519c0e..3f3eaba 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
@@ -212,14 +212,14 @@ public class FunctionExecutionPooledExecutor extends ThreadPoolExecutor {
   }
 
   @Override
-  protected final void beforeExecute(Thread t, Runnable r) {
+  protected void beforeExecute(Thread t, Runnable r) {
     if (this.stats != null) {
       this.stats.startJob();
     }
   }
 
   @Override
-  protected final void afterExecute(Runnable r, Throwable ex) {
+  protected void afterExecute(Runnable r, Throwable ex) {
     if (this.stats != null) {
       this.stats.endJob();
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
index 873ec4b..eeb44e7a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
@@ -1460,7 +1460,7 @@ public class InternalDistributedSystem extends DistributedSystem
   /**
    * Returns the distribution manager without checking for connected or not so can also return null.
    */
-  public final DM getDM() {
+  public DM getDM() {
     return this.dm;
   }
 
@@ -1471,7 +1471,7 @@ public class InternalDistributedSystem extends DistributedSystem
    * 
    * @return the quorum checking service
    */
-  public final QuorumChecker getQuorumChecker() {
+  public QuorumChecker getQuorumChecker() {
     return this.quorumChecker;
   }
 
@@ -1743,7 +1743,7 @@ public class InternalDistributedSystem extends DistributedSystem
   }
 
   @Override
-  public final int getStatisticsCount() {
+  public int getStatisticsCount() {
     int result = 0;
     List<Statistics> statsList = this.statsList;
     if (statsList != null) {
@@ -1753,7 +1753,7 @@ public class InternalDistributedSystem extends DistributedSystem
   }
 
   @Override
-  public final Statistics findStatistics(long id) {
+  public Statistics findStatistics(long id) {
     List<Statistics> statsList = this.statsList;
     for (Statistics s : statsList) {
       if (s.getUniqueId() == id) {
@@ -1765,7 +1765,7 @@ public class InternalDistributedSystem extends DistributedSystem
   }
 
   @Override
-  public final boolean statisticsExists(long id) {
+  public boolean statisticsExists(long id) {
     List<Statistics> statsList = this.statsList;
     for (Statistics s : statsList) {
       if (s.getUniqueId() == id) {
@@ -1776,7 +1776,7 @@ public class InternalDistributedSystem extends DistributedSystem
   }
 
   @Override
-  public final Statistics[] getStatistics() {
+  public Statistics[] getStatistics() {
     List<Statistics> statsList = this.statsList;
     return (Statistics[]) statsList.toArray(new Statistics[0]);
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
index b7f6e04..1f51a8d 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
@@ -112,7 +112,7 @@ public class LocatorStats {
   }
 
 
-  public final void setServerCount(int sc) {
+  public void setServerCount(int sc) {
     if (this._stats == null) {
       this.endpoints_known.set(sc);
     } else {
@@ -120,7 +120,7 @@ public class LocatorStats {
     }
   }
 
-  public final void setLocatorCount(int lc) {
+  public void setLocatorCount(int lc) {
     if (this._stats == null) {
       this.known_locators.set(lc);
     } else {
@@ -128,7 +128,7 @@ public class LocatorStats {
     }
   }
 
-  public final void endLocatorRequest(long startTime) {
+  public void endLocatorRequest(long startTime) {
     long took = DistributionStats.getStatTime() - startTime;
     if (this._stats == null) {
       this.requests_to_locator.incrementAndGet();
@@ -143,7 +143,7 @@ public class LocatorStats {
     }
   }
 
-  public final void endLocatorResponse(long startTime) {
+  public void endLocatorResponse(long startTime) {
     long took = DistributionStats.getStatTime() - startTime;
     if (this._stats == null) {
       this.responses_from_locator.incrementAndGet();
@@ -160,7 +160,7 @@ public class LocatorStats {
 
 
 
-  public final void setLocatorRequests(long rl) {
+  public void setLocatorRequests(long rl) {
     if (this._stats == null) {
       this.requests_to_locator.set(rl);
     } else {
@@ -168,7 +168,7 @@ public class LocatorStats {
     }
   }
 
-  public final void setLocatorResponses(long rl) {
+  public void setLocatorResponses(long rl) {
     if (this._stats == null) {
       this.responses_from_locator.set(rl);
     } else {
@@ -176,7 +176,7 @@ public class LocatorStats {
     }
   }
 
-  public final void setServerLoadUpdates(long v) {
+  public void setServerLoadUpdates(long v) {
     if (this._stats == null) {
       this.serverLoadUpdates.set(v);
     } else {
@@ -184,7 +184,7 @@ public class LocatorStats {
     }
   }
 
-  public final void incServerLoadUpdates() {
+  public void incServerLoadUpdates() {
     if (this._stats == null) {
       this.serverLoadUpdates.incrementAndGet();
     } else {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java
index 4a76f20..9888342 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java
@@ -23,7 +23,7 @@ package org.apache.geode.distributed.internal;
 public abstract class PooledDistributionMessage extends DistributionMessage {
 
   @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/distributed/internal/PooledExecutorWithDMStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
index f2092a4..00dcf00 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
@@ -151,14 +151,14 @@ public class PooledExecutorWithDMStats extends ThreadPoolExecutor {
   }
 
   @Override
-  protected final void beforeExecute(Thread t, Runnable r) {
+  protected void beforeExecute(Thread t, Runnable r) {
     if (this.stats != null) {
       this.stats.startJob();
     }
   }
 
   @Override
-  protected final void afterExecute(Runnable r, Throwable ex) {
+  protected void afterExecute(Runnable r, Throwable ex) {
     if (this.stats != null) {
       this.stats.endJob();
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
index 3904ba7..c57d38e 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
@@ -90,7 +90,7 @@ public class ReliableReplyProcessor21 extends ReplyProcessor21 {
    * @throws InterruptedException
    * @throws ReliableReplyException when a member departs
    */
-  public final void waitForReliableDelivery()
+  public void waitForReliableDelivery()
       throws ReplyException, InterruptedException, ReliableReplyException {
     waitForReliableDelivery(0);
   }
@@ -102,7 +102,7 @@ public class ReliableReplyProcessor21 extends ReplyProcessor21 {
    * @throws InterruptedException
    * @throws ReliableReplyException
    */
-  public final void waitForReliableDelivery(long msecs)
+  public void waitForReliableDelivery(long msecs)
       throws ReplyException, InterruptedException, ReliableReplyException {
     super.waitForReplies(msecs);
     synchronized (this) {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java
index 73fde88..2673f68 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java
@@ -182,11 +182,11 @@ public class ReplyMessage extends HighPriorityDistributionMessage {
    * @param dm the distribution manager that is processing the message.
    */
   @Override
-  protected final void process(final DistributionManager dm) {
+  protected void process(final DistributionManager dm) {
     dmProcess(dm);
   }
 
-  public final void dmProcess(final DM dm) {
+  public void dmProcess(final DM dm) {
     final long startTime = getTimestamp();
     ReplyProcessor21 processor = ReplyProcessor21.getProcessor(processorId);
     try {
@@ -262,7 +262,7 @@ public class ReplyMessage extends HighPriorityDistributionMessage {
   public static final byte OBJECT_FLAG = 0x40;
   public static final byte INTERNAL_FLAG = (byte) 0x80;
 
-  private static final boolean testFlag(byte status, byte flag) {
+  private static boolean testFlag(byte status, byte flag) {
     return (status & flag) != 0;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
index bc66dd8..7e87c8c 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
@@ -512,7 +512,7 @@ public class ReplyProcessor21 implements MembershipListener {
    * @throws InterruptedException thrown if the wait is interrupted
    * @see #canStopWaiting()
    */
-  public final void waitForReplies() throws InterruptedException, ReplyException {
+  public void waitForReplies() throws InterruptedException, ReplyException {
 
     boolean result = waitForReplies(0);
     Assert.assertTrue(result, "failed but no exception thrown");
@@ -587,7 +587,7 @@ public class ReplyProcessor21 implements MembershipListener {
 
   // start waiting for replies without explicitly waiting for all of them using
   // waitForReplies* methods; useful for streaming of results in function execution
-  public final void startWait() {
+  public void startWait() {
     if (!this.waiting && stillWaiting()) {
       preWait();
     }
@@ -595,7 +595,7 @@ public class ReplyProcessor21 implements MembershipListener {
 
   // end waiting for replies without explicitly invoking waitForReplies*
   // methods; useful for streaming of results in function execution
-  public final void endWait(boolean doCleanup) {
+  public void endWait(boolean doCleanup) {
     try {
       postWait();
     } finally {
@@ -618,11 +618,11 @@ public class ReplyProcessor21 implements MembershipListener {
    *
    * @return Whether or not we received all of the replies in the given amount of time.
    */
-  public final boolean waitForReplies(long msecs) throws InterruptedException, ReplyException {
+  public boolean waitForReplies(long msecs) throws InterruptedException, ReplyException {
     return waitForReplies(msecs, getLatch(), true);
   }
 
-  public final boolean waitForReplies(long msecs, StoppableCountDownLatch latch, boolean doCleanUp)
+  public boolean waitForReplies(long msecs, StoppableCountDownLatch latch, boolean doCleanUp)
       throws InterruptedException, ReplyException {
     if (this.keeperCleanedUp) {
       throw new IllegalStateException(
@@ -765,11 +765,11 @@ public class ReplyProcessor21 implements MembershipListener {
    *         "ack-threshold-exception" is set to true
    * @throws IllegalStateException if the processor is not registered to receive replies
    */
-  public final boolean waitForRepliesUninterruptibly(long p_msecs) throws ReplyException {
+  public boolean waitForRepliesUninterruptibly(long p_msecs) throws ReplyException {
     return waitForRepliesUninterruptibly(p_msecs, getLatch(), true);
   }
 
-  public final boolean waitForRepliesUninterruptibly(long p_msecs, StoppableCountDownLatch latch,
+  public boolean waitForRepliesUninterruptibly(long p_msecs, StoppableCountDownLatch latch,
       boolean doCleanUp) throws ReplyException {
     if (this.keeperCleanedUp) {
       throw new IllegalStateException(

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java
index 45cffa3..5861e40 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java
@@ -33,14 +33,14 @@ public class SerialQueuedExecutorWithDMStats extends ThreadPoolExecutor {
   }
 
   @Override
-  protected final void beforeExecute(Thread t, Runnable r) {
+  protected void beforeExecute(Thread t, Runnable r) {
     if (this.stats != null) {
       this.stats.startJob();
     }
   }
 
   @Override
-  protected final void afterExecute(Runnable r, Throwable ex) {
+  protected void afterExecute(Runnable r, Throwable ex) {
     if (this.stats != null) {
       this.stats.endJob();
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java
index 6dcf0a5..3004496 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java
@@ -66,11 +66,11 @@ public class ServerLocation implements DataSerializable, Comparable {
     this.port = port;
   }
 
-  public final String getHostName() {
+  public String getHostName() {
     return hostName;
   }
 
-  public final int getPort() {
+  public int getPort() {
     return port;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
index ec2e3e6..a8dec5d 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
@@ -231,7 +231,7 @@ public class DirectChannel {
    * @throws ConnectExceptions if message could not be send to its <code>destination</code>
    * @throws NotSerializableException If the msg cannot be serialized
    */
-  private final int sendToOne(final MembershipManager mgr,
+  private int sendToOne(final MembershipManager mgr,
       InternalDistributedMember[] p_destinations, final DistributionMessage msg,
       long ackWaitThreshold, long ackSAThreshold)
       throws ConnectExceptions, NotSerializableException {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
index 35d19bb..c38cdad 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
@@ -255,15 +255,15 @@ public class DLockService extends DistributedLockService {
     }
   }
 
-  private final boolean isCurrentThreadDoingDestroy() {
+  private boolean isCurrentThreadDoingDestroy() {
     return Boolean.TRUE.equals(this.destroyingThread.get());
   }
 
-  private final void setDestroyingThread() {
+  private void setDestroyingThread() {
     this.destroyingThread.set(Boolean.TRUE);
   }
 
-  private final void clearDestroyingThread() {
+  private void clearDestroyingThread() {
     this.destroyingThread.remove();
   }
 
@@ -2102,7 +2102,7 @@ public class DLockService extends DistributedLockService {
   // Public instance methods
   // -------------------------------------------------------------------------
 
-  public final DistributedLockStats getStats() {
+  public DistributedLockStats getStats() {
     return this.dlockStats;
   }
 
@@ -2299,11 +2299,11 @@ public class DLockService extends DistributedLockService {
   }
 
   /** The name of this service */
-  public final String getName() {
+  public String getName() {
     return this.serviceName;
   }
 
-  public final DM getDistributionManager() {
+  public DM getDistributionManager() {
     return this.dm;
   }
 
@@ -3270,7 +3270,7 @@ public class DLockService extends DistributedLockService {
 
   }
 
-  public final CancelCriterion getCancelCriterion() {
+  public CancelCriterion getCancelCriterion() {
     return stopper;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
index ba78771..1ee15af 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
@@ -355,7 +355,7 @@ public class ElderState {
     }
   }
 
-  private final boolean isInitiatingTransfer(GrantorInfo gi) {
+  private boolean isInitiatingTransfer(GrantorInfo gi) {
     if (gi == null)
       return false;
     synchronized (this) {
@@ -363,20 +363,20 @@ public class ElderState {
     }
   }
 
-  private final void beginInitiatingTransfer(GrantorInfo gi) {
+  private void beginInitiatingTransfer(GrantorInfo gi) {
     synchronized (this) {
       gi.setInitiatingTransfer(true);
     }
   }
 
-  private final void finishInitiatingTransfer(GrantorInfo gi) {
+  private void finishInitiatingTransfer(GrantorInfo gi) {
     synchronized (this) {
       gi.setInitiatingTransfer(false);
       notifyAll();
     }
   }
 
-  private final void waitWhileInitiatingTransfer(GrantorInfo gi) {
+  private void waitWhileInitiatingTransfer(GrantorInfo gi) {
     synchronized (this) {
       boolean interrupted = false;
       try {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
index 449627d..6fd969f 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
@@ -38,40 +38,40 @@ public class GrantorInfo {
   }
 
   /** Caller is sync'ed on ElderState */
-  public final void setInitiatingTransfer(boolean initiatingTransfer) {
+  public void setInitiatingTransfer(boolean initiatingTransfer) {
     this.initiatingTransfer = initiatingTransfer;
   }
 
   /** Caller is sync'ed on ElderState */
-  public final boolean isInitiatingTransfer() {
+  public boolean isInitiatingTransfer() {
     return this.initiatingTransfer;
   }
 
   /**
    * Gets the member id of this grantor.
    */
-  public final InternalDistributedMember getId() {
+  public InternalDistributedMember getId() {
     return this.id;
   }
 
   /**
    * Returns true if the current grantor needs to do lock recovery.
    */
-  public final boolean needsRecovery() {
+  public boolean needsRecovery() {
     return this.needsRecovery;
   }
 
   /**
    * Returns the elder version id of this grantor.
    */
-  public final long getVersionId() {
+  public long getVersionId() {
     return this.versionId;
   }
 
   /**
    * Returns the DLockService serial number of this grantor.
    */
-  public final int getSerialNumber() {
+  public int getSerialNumber() {
     return this.serialNumber;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
index 14f4bc1..21dd318 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
@@ -114,7 +114,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
     }
   }
 
-  private final static boolean basicStartElderCall(InternalDistributedSystem sys, ElderState es,
+  private static boolean basicStartElderCall(InternalDistributedSystem sys, ElderState es,
       InternalDistributedMember elder, DLockService dls) {
     GrantorRequestContext grc = sys.getGrantorRequestContext();
     grc.elderLock.lock();
@@ -217,7 +217,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
    * Sets currentElder to the memberId of the current elder if elder is remote; null if elder is in
    * our vm. TODO: collaboration lock was removed
    */
-  private final static ElderState startElderCall(InternalDistributedSystem sys, DLockService dls,
+  private static ElderState startElderCall(InternalDistributedSystem sys, DLockService dls,
       boolean usesElderCollaborationLock) {
     InternalDistributedMember elder;
     ElderState es = null;
@@ -248,7 +248,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
     return es;
   }
 
-  private final static void finishElderCall(GrantorRequestContext grc, ElderState es) {
+  private static void finishElderCall(GrantorRequestContext grc, ElderState es) {
     if (es == null) {
       grc.elderLock.lock();
       try {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
index 41c85d6..b993b53 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
@@ -1166,12 +1166,12 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
    * index)); } else { sb.append(hostname); } }
    */
 
-  public final void setVersionObjectForTest(Version v) {
+  public void setVersionObjectForTest(Version v) {
     this.versionObj = v;
     netMbr.setVersion(v);
   }
 
-  public final Version getVersionObject() {
+  public Version getVersionObject() {
     return this.versionObj;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
index 94c5f38..d2a6d1e 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
@@ -77,19 +77,19 @@ public class JGAddress extends UUID {
   }
 
 
-  public final InetAddress getInetAddress() {
+  public InetAddress getInetAddress() {
     return ip_addr;
   }
 
-  public final int getPort() {
+  public int getPort() {
     return port;
   }
 
-  public final int getVmViewId() {
+  public int getVmViewId() {
     return this.vmViewId;
   }
 
-  protected final void setVmViewId(int id) {
+  protected void setVmViewId(int id) {
     this.vmViewId = id;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java
index cf00187..be4047f 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java
@@ -47,7 +47,7 @@ public class LocalViewMessage extends SerialDistributionMessage {
   }
 
   @Override
-  final public int getProcessorType() {
+  public int getProcessorType() {
     return DistributionManager.VIEW_EXECUTOR;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java b/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java
index 768475b..2e81af6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java
@@ -51,7 +51,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    *        (a copy is not made) so it should not be changed externally.
    * @param version the product version that serialized the object on given bytes
    */
-  public final void initialize(byte[] bytes, Version version) {
+  public void initialize(byte[] bytes, Version version) {
     this.bytes = bytes;
     this.nBytes = bytes.length;
     this.pos = 0;
@@ -62,11 +62,11 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final Version getVersion() {
+  public Version getVersion() {
     return this.version;
   }
 
-  private final int skipOver(long n) {
+  private int skipOver(long n) {
     final int capacity = (this.nBytes - this.pos);
     if (n <= capacity) {
       this.pos += (int) n;
@@ -81,7 +81,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final int read() throws IOException {
+  public int read() throws IOException {
     if (this.pos < this.nBytes) {
       return (this.bytes[this.pos++] & 0xff);
     } else {
@@ -93,7 +93,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final int read(byte[] b, int off, int len) {
+  public int read(byte[] b, int off, int len) {
     if (b == null) {
       throw new NullPointerException();
     } else if (off < 0 || len < 0 || b.length < (off + len)) {
@@ -117,7 +117,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final long skip(long n) {
+  public long skip(long n) {
     return skipOver(n);
   }
 
@@ -125,21 +125,21 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final int available() {
+  public int available() {
     return (this.nBytes - this.pos);
   }
 
   /**
    * Get the current position in the byte[].
    */
-  public final int position() {
+  public int position() {
     return this.pos;
   }
 
   /**
    * Set the current position in the byte[].
    */
-  public final void setPosition(int pos) {
+  public void setPosition(int pos) {
     this.pos = pos;
   }
 
@@ -147,7 +147,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final void readFully(byte[] b) throws IOException {
+  public void readFully(byte[] b) throws IOException {
     final int len = b.length;
     System.arraycopy(this.bytes, this.pos, b, 0, len);
     this.pos += len;
@@ -157,7 +157,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final void readFully(byte[] b, int off, int len) throws IOException {
+  public void readFully(byte[] b, int off, int len) throws IOException {
     if (len > 0) {
       if ((this.nBytes - this.pos) >= len) {
         System.arraycopy(this.bytes, this.pos, b, off, len);
@@ -174,7 +174,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final int skipBytes(int n) {
+  public int skipBytes(int n) {
     return skipOver(n);
   }
 
@@ -182,7 +182,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final boolean readBoolean() throws IOException {
+  public boolean readBoolean() throws IOException {
     if (this.pos < this.nBytes) {
       return (this.bytes[this.pos++] != 0);
     } else {
@@ -194,7 +194,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final byte readByte() throws IOException {
+  public byte readByte() throws IOException {
     if (this.pos < this.nBytes) {
       return this.bytes[this.pos++];
     } else {
@@ -206,7 +206,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final int readUnsignedByte() throws IOException {
+  public int readUnsignedByte() throws IOException {
     return read();
   }
 
@@ -214,7 +214,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final short readShort() throws IOException {
+  public short readShort() throws IOException {
     if ((this.pos + 1) < this.nBytes) {
       int result = (this.bytes[this.pos++] & 0xff);
       return (short) ((result << 8) | (this.bytes[this.pos++] & 0xff));
@@ -227,7 +227,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final int readUnsignedShort() throws IOException {
+  public int readUnsignedShort() throws IOException {
     if ((this.pos + 1) < this.nBytes) {
       int result = (this.bytes[this.pos++] & 0xff);
       return ((result << 8) | (this.bytes[this.pos++] & 0xff));
@@ -268,7 +268,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final long readLong() throws IOException {
+  public long readLong() throws IOException {
     if ((this.pos + 7) < this.nBytes) {
       long result = (this.bytes[this.pos++] & 0xff);
       result = (result << 8) | (this.bytes[this.pos++] & 0xff);
@@ -287,7 +287,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final float readFloat() throws IOException {
+  public float readFloat() throws IOException {
     return Float.intBitsToFloat(readInt());
   }
 
@@ -295,7 +295,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final double readDouble() throws IOException {
+  public double readDouble() throws IOException {
     return Double.longBitsToDouble(readLong());
   }
 
@@ -303,7 +303,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
    * {@inheritDoc}
    */
   @Override
-  public final String readUTF() throws IOException {
+  public String readUTF() throws IOException {
     final int utfLen = readUnsignedShort();
 
     if ((this.pos + utfLen) <= this.nBytes) {

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java
index 2363990..10685ed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java
@@ -37,7 +37,7 @@ public class ByteBufferOutputStream extends OutputStream {
 
   /** write the low-order 8 bits of the given int */
   @Override
-  public final void write(int b) {
+  public void write(int b) {
     try {
       this.buffer.put((byte) (b & 0xff));
     } catch (BufferOverflowException e) {
@@ -77,11 +77,11 @@ public class ByteBufferOutputStream extends OutputStream {
     }
   }
 
-  public final int size() {
+  public int size() {
     return buffer.position();
   }
 
-  public final void reset() {
+  public void reset() {
     buffer.clear();
   }
 
@@ -89,7 +89,7 @@ public class ByteBufferOutputStream extends OutputStream {
    * gets the content ByteBuffer, ready for reading. The stream should not be written to past this
    * point until it has been reset.
    */
-  public final ByteBuffer getContentBuffer() {
+  public ByteBuffer getContentBuffer() {
     buffer.flip();
     return buffer;
   }
@@ -97,7 +97,7 @@ public class ByteBufferOutputStream extends OutputStream {
   /**
    * Gets a duplicate of the current content buffer.
    */
-  public final ByteBuffer getDuplicateBuffer() {
+  public ByteBuffer getDuplicateBuffer() {
     return buffer.duplicate();
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java b/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
index be3b18c..4e77f38 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
@@ -31,11 +31,11 @@ public abstract class ExternalizableDSFID implements DataSerializableFixedID, Ex
 
   public abstract void fromData(DataInput in) throws IOException, ClassNotFoundException;
 
-  public final void writeExternal(ObjectOutput out) throws IOException {
+  public void writeExternal(ObjectOutput out) throws IOException {
     toData(out);
   }
 
-  public final void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+  public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
     fromData(in);
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/5abc4863/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java b/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
index f71a7c1..120d625 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
@@ -32,11 +32,11 @@ import org.apache.geode.management.internal.cli.util.GfshConsoleReader;
 public class GfeConsoleReaderFactory {
   private static GfeConsoleReader defaultConsoleReader = createConsoleReader();
 
-  public static final GfeConsoleReader getDefaultConsoleReader() {
+  public static GfeConsoleReader getDefaultConsoleReader() {
     return defaultConsoleReader;
   }
 
-  public static final GfeConsoleReader createConsoleReader() {
+  public static GfeConsoleReader createConsoleReader() {
     GfeConsoleReader consoleReader = null;
 
     if (CliUtil.isGfshVM()) {