You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2017/05/22 18:29:29 UTC

[33/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses of final from internal classes

GEODE-2929: remove superfluous uses of final from internal classes


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

Branch: refs/heads/feature/GEODE-2580
Commit: a44585316a8d7eed35917c1dfd829315b34ce316
Parents: f18e1d2
Author: Kirk Lund <kl...@apache.org>
Authored: Mon May 15 14:56:59 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue May 16 12:07:34 2017 -0700

----------------------------------------------------------------------
 .../admin/internal/AbstractHealthEvaluator.java |   4 +-
 .../internal/AdminDistributedSystemImpl.java    |   2 +-
 .../internal/DistributedSystemConfigImpl.java   |   2 +-
 .../SystemMemberCacheEventProcessor.java        |   2 +-
 .../geode/admin/internal/SystemMemberImpl.java  |  26 +--
 .../geode/cache/DiskWriteAttributesFactory.java |   2 +-
 .../geode/cache/client/internal/AbstractOp.java |   8 +-
 .../client/internal/ClientMetadataService.java  |   4 +-
 .../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 +-
 .../operations/internal/UpdateOnlyMap.java      |   5 +-
 .../cache/query/internal/ObjectIntHashMap.java  |  20 +--
 .../query/internal/QueryObserverHolder.java     |   8 +-
 .../internal/ResultsCollectionWrapper.java      |   2 +-
 .../geode/cache/query/internal/ResultsSet.java  |   2 +-
 .../cache/query/internal/SortedResultSet.java   |   2 +-
 .../cache/query/internal/SortedStructSet.java   |   2 +-
 .../geode/cache/query/internal/StructBag.java   |  10 +-
 .../geode/cache/query/internal/StructSet.java   |   6 +-
 .../geode/cache/query/internal/Undefined.java   |   2 +-
 .../query/internal/index/HashIndexSet.java      |   8 +-
 .../cache/query/internal/types/MapTypeImpl.java |   2 +-
 .../query/internal/types/StructTypeImpl.java    |   2 +-
 .../apache/geode/cache/wan/EventSequenceID.java |   2 +-
 .../geode/compression/SnappyCompressor.java     |   2 +-
 .../geode/distributed/LocatorLauncher.java      |   4 +-
 .../geode/distributed/ServerLauncher.java       |   2 +-
 .../internal/AbstractDistributionConfig.java    |   2 +-
 .../internal/DistributionAdvisor.java           |  16 +-
 .../internal/DistributionConfigSnapshot.java    |   2 +-
 .../internal/DistributionManager.java           |  18 +--
 .../internal/DistributionMessage.java           |   6 +-
 .../internal/DistributionMessageObserver.java   |   5 +-
 .../FunctionExecutionPooledExecutor.java        |   4 +-
 .../internal/HighPriorityAckedMessage.java      |   2 +-
 .../internal/InternalDistributedSystem.java     |  12 +-
 .../internal/LocatorLoadSnapshot.java           |   4 +-
 .../distributed/internal/LocatorStats.java      |  16 +-
 .../internal/PooledDistributionMessage.java     |   2 +-
 .../internal/PooledExecutorWithDMStats.java     |   4 +-
 .../distributed/internal/ProductUseLog.java     |   2 +-
 .../internal/ReliableReplyProcessor21.java      |   4 +-
 .../distributed/internal/ReplyMessage.java      |   6 +-
 .../distributed/internal/ReplyProcessor21.java  |  14 +-
 .../internal/RuntimeDistributionConfigImpl.java |   2 +-
 .../internal/SerialAckedMessage.java            |   3 +-
 .../SerialQueuedExecutorWithDMStats.java        |   4 +-
 .../distributed/internal/ServerLocation.java    |   4 +-
 .../distributed/internal/ShutdownMessage.java   |   2 +-
 .../distributed/internal/StartupMessage.java    |   3 +-
 .../internal/direct/DirectChannel.java          |   5 +-
 .../internal/locks/DLockQueryProcessor.java     |   4 +-
 .../locks/DLockRecoverGrantorProcessor.java     |   4 +-
 .../internal/locks/DLockReleaseProcessor.java   |   4 +-
 .../internal/locks/DLockService.java            |  16 +-
 .../internal/locks/DeposeGrantorProcessor.java  |   2 +-
 .../internal/locks/DistributedMemberLock.java   |   2 +-
 .../internal/locks/ElderInitProcessor.java      |   4 +-
 .../distributed/internal/locks/ElderState.java  |   8 +-
 .../distributed/internal/locks/GrantorInfo.java |  12 +-
 .../internal/locks/GrantorRequestProcessor.java |  10 +-
 .../locks/NonGrantorDestroyedProcessor.java     |   4 +-
 .../membership/InternalDistributedMember.java   |   4 +-
 .../membership/gms/messenger/JGAddress.java     |   8 +-
 .../membership/gms/mgr/LocalViewMessage.java    |   4 +-
 .../internal/streaming/StreamingOperation.java  |   2 +-
 .../geode/internal/ByteArrayDataInput.java      |  42 ++---
 .../geode/internal/ByteBufferOutputStream.java  |  12 +-
 .../geode/internal/ExternalizableDSFID.java     |   4 +-
 .../geode/internal/GfeConsoleReaderFactory.java |   4 +-
 .../geode/internal/HeapDataOutputStream.java    |  69 ++++----
 .../geode/internal/InternalDataSerializer.java  |   8 +-
 .../geode/internal/InternalInstantiator.java    |   2 +-
 .../geode/internal/NullDataOutputStream.java    |  30 ++--
 .../geode/internal/ObjIdConcurrentMap.java      |  39 +++--
 .../org/apache/geode/internal/PureJavaMode.java |   8 +-
 .../org/apache/geode/internal/SetUtils.java     |   2 +-
 .../org/apache/geode/internal/SystemAdmin.java  |   2 +-
 .../java/org/apache/geode/internal/Version.java |  28 ++--
 .../internal/VersionedDataInputStream.java      |   2 +-
 .../internal/VersionedDataOutputStream.java     |   5 +-
 .../geode/internal/VersionedObjectInput.java    |   2 +-
 .../geode/internal/VersionedObjectOutput.java   |   2 +-
 .../admin/remote/AddHealthListenerRequest.java  |   2 +-
 .../admin/remote/AddHealthListenerResponse.java |   2 +-
 .../admin/remote/AddStatListenerRequest.java    |   2 +-
 .../admin/remote/AddStatListenerResponse.java   |   2 +-
 .../remote/AdminConsoleDisconnectMessage.java   |   2 +-
 .../admin/remote/AdminConsoleMessage.java       |   2 +-
 .../admin/remote/AdminFailureResponse.java      |   2 +-
 .../admin/remote/AlertLevelChangeMessage.java   |   2 +-
 .../admin/remote/AlertListenerMessage.java      |   3 +-
 .../admin/remote/AppCacheSnapshotMessage.java   |   2 +-
 .../admin/remote/BridgeServerRequest.java       |   2 +-
 .../admin/remote/BridgeServerResponse.java      |   2 +-
 .../admin/remote/CacheConfigRequest.java        |   2 +-
 .../admin/remote/CacheConfigResponse.java       |   2 +-
 .../internal/admin/remote/CacheDisplay.java     |   2 +-
 .../internal/admin/remote/CacheInfoRequest.java |   2 +-
 .../admin/remote/CacheInfoResponse.java         |   2 +-
 .../admin/remote/CancelStatListenerRequest.java |   2 +-
 .../remote/CancelStatListenerResponse.java      |   2 +-
 .../admin/remote/CancellationMessage.java       |   2 +-
 .../admin/remote/DestroyEntryMessage.java       |   2 +-
 .../admin/remote/DestroyRegionMessage.java      |   2 +-
 .../admin/remote/FetchDistLockInfoRequest.java  |   2 +-
 .../admin/remote/FetchDistLockInfoResponse.java |   2 +-
 .../remote/FetchHealthDiagnosisRequest.java     |   2 +-
 .../remote/FetchHealthDiagnosisResponse.java    |   2 +-
 .../internal/admin/remote/FetchHostRequest.java |   2 +-
 .../admin/remote/FetchHostResponse.java         |   2 +-
 .../remote/FetchResourceAttributesRequest.java  |   2 +-
 .../remote/FetchResourceAttributesResponse.java |   2 +-
 .../admin/remote/FetchStatsRequest.java         |   2 +-
 .../admin/remote/FetchStatsResponse.java        |   2 +-
 .../admin/remote/FetchSysCfgRequest.java        |   2 +-
 .../admin/remote/FetchSysCfgResponse.java       |   2 +-
 .../remote/FlushAppCacheSnapshotMessage.java    |   2 +-
 .../admin/remote/HealthListenerMessage.java     |   3 +-
 .../admin/remote/LicenseInfoRequest.java        |   2 +-
 .../admin/remote/LicenseInfoResponse.java       |   2 +-
 .../admin/remote/ObjectDetailsRequest.java      |   2 +-
 .../admin/remote/ObjectDetailsResponse.java     |   2 +-
 .../admin/remote/ObjectNamesRequest.java        |   2 +-
 .../admin/remote/ObjectNamesResponse.java       |   2 +-
 .../admin/remote/RegionAttributesRequest.java   |   2 +-
 .../admin/remote/RegionAttributesResponse.java  |   2 +-
 .../internal/admin/remote/RegionRequest.java    |   2 +-
 .../internal/admin/remote/RegionResponse.java   |   2 +-
 .../admin/remote/RegionSizeRequest.java         |   2 +-
 .../admin/remote/RegionSizeResponse.java        |   2 +-
 .../admin/remote/RegionStatisticsRequest.java   |   2 +-
 .../admin/remote/RegionStatisticsResponse.java  |   2 +-
 .../admin/remote/RemoteApplicationVM.java       |   2 +-
 .../admin/remote/RemoteGfManagerAgent.java      |   2 +-
 .../admin/remote/RemoteRegionAttributes.java    |   4 +-
 .../remote/RemoveHealthListenerRequest.java     |   2 +-
 .../remote/RemoveHealthListenerResponse.java    |   2 +-
 .../admin/remote/ResetHealthStatusRequest.java  |   2 +-
 .../admin/remote/ResetHealthStatusResponse.java |   2 +-
 .../admin/remote/RootRegionRequest.java         |   2 +-
 .../admin/remote/RootRegionResponse.java        |   2 +-
 .../admin/remote/SnapshotResultMessage.java     |   3 +-
 .../admin/remote/StatListenerMessage.java       |   3 +-
 .../admin/remote/StoreSysCfgRequest.java        |   2 +-
 .../admin/remote/StoreSysCfgResponse.java       |   2 +-
 .../internal/admin/remote/SubRegionRequest.java |   2 +-
 .../admin/remote/SubRegionResponse.java         |   2 +-
 .../internal/admin/remote/TailLogRequest.java   |   2 +-
 .../internal/admin/remote/TailLogResponse.java  |   2 +-
 .../admin/remote/VersionInfoRequest.java        |   2 +-
 .../admin/remote/VersionInfoResponse.java       |   2 +-
 .../admin/statalerts/BaseDecoratorImpl.java     |   6 +-
 .../admin/statalerts/FunctionDecoratorImpl.java |   2 +-
 .../admin/statalerts/FunctionHelper.java        |   8 +-
 .../statalerts/GaugeThresholdDecoratorImpl.java |   2 +-
 .../statalerts/MultiAttrDefinitionImpl.java     |   2 +-
 .../NumberThresholdDecoratorImpl.java           |   2 +-
 .../statalerts/SingleAttrDefinitionImpl.java    |   2 +-
 .../internal/cache/AbstractDiskRegion.java      |   8 +-
 .../internal/cache/AbstractLRURegionMap.java    |  36 ++---
 .../cache/AbstractOplogDiskRegionEntry.java     |  16 +-
 .../geode/internal/cache/AbstractRegion.java    |  12 +-
 .../geode/internal/cache/AbstractRegionMap.java |  68 ++++----
 .../internal/cache/AbstractUpdateOperation.java |   2 +-
 .../geode/internal/cache/BucketAdvisor.java     |  10 +-
 .../geode/internal/cache/BucketRegion.java      |   8 +-
 .../cache/BytesAndBitsForCompactor.java         |   8 +-
 .../internal/cache/CacheObserverHolder.java     |   4 +-
 .../internal/cache/CacheServerLauncher.java     |   2 +-
 .../internal/cache/ClientRegionEventImpl.java   |   2 +-
 .../cache/ClientServerObserverHolder.java       |   4 +-
 .../geode/internal/cache/CloseCacheMessage.java |   3 +-
 .../internal/cache/CreateRegionProcessor.java   |   4 +-
 .../geode/internal/cache/DestroyOperation.java  |   2 +-
 .../cache/DestroyPartitionedRegionMessage.java  |   2 +-
 .../internal/cache/DestroyRegionOperation.java  |   4 +-
 .../apache/geode/internal/cache/DiskRegion.java |  32 ++--
 .../geode/internal/cache/DiskStoreImpl.java     |  30 ++--
 .../internal/cache/DiskWriteAttributesImpl.java |   2 +-
 .../internal/cache/DistPeerTXStateStub.java     |   7 +-
 .../internal/cache/DistTXCommitMessage.java     |   4 +-
 .../internal/cache/DistTXPrecommitMessage.java  |   8 +-
 .../internal/cache/DistTXRollbackMessage.java   |   6 +-
 .../cache/DistTXStateOnCoordinator.java         |   9 +-
 .../cache/DistributedCacheOperation.java        |   4 +-
 .../cache/DistributedClearOperation.java        |   4 +-
 .../cache/DistributedPutAllOperation.java       |   6 +-
 .../geode/internal/cache/DistributedRegion.java |   4 +-
 ...stributedRegionFunctionStreamingMessage.java |   4 +-
 .../cache/DistributedRemoveAllOperation.java    |   4 +-
 .../apache/geode/internal/cache/EntriesSet.java |   2 +-
 .../geode/internal/cache/EntryEventImpl.java    |  64 ++++----
 .../geode/internal/cache/EntryExpiryTask.java   |   2 +-
 .../internal/cache/EvictionAttributesImpl.java  |   6 +-
 .../apache/geode/internal/cache/ExpiryTask.java |  18 +--
 .../FunctionStreamingOrderedReplyMessage.java   |   2 +-
 .../geode/internal/cache/GridAdvisor.java       |   8 +-
 .../apache/geode/internal/cache/HARegion.java   |   8 +-
 .../internal/cache/InitialImageOperation.java   |  14 +-
 .../geode/internal/cache/InlineKeyHelper.java   |   2 +-
 .../internal/cache/InternalRegionArguments.java |   2 +-
 .../internal/cache/InvalidateOperation.java     |   2 +-
 .../cache/InvalidateRegionOperation.java        |   2 +-
 .../apache/geode/internal/cache/KeyInfo.java    |  12 +-
 .../geode/internal/cache/LeafRegionEntry.cpp    |  79 ++++-----
 .../geode/internal/cache/LocalRegion.java       |   4 +-
 .../org/apache/geode/internal/cache/Node.java   |   2 +-
 .../internal/cache/NonLocalRegionEntry.java     |   4 +-
 .../org/apache/geode/internal/cache/OpType.java |   2 +-
 .../geode/internal/cache/OverflowOplogSet.java  |  14 +-
 .../geode/internal/cache/PRQueryProcessor.java  |   6 +-
 .../internal/cache/PartitionRegionConfig.java   |   8 +-
 .../cache/PartitionedRegionDataStore.java       |  16 +-
 .../internal/cache/PartitionedRegionStats.java  |   2 +-
 .../internal/cache/PersistentOplogSet.java      |  12 +-
 .../apache/geode/internal/cache/PoolStats.java  |  18 +--
 .../cache/PreferBytesCachedDeserializable.java  |   2 +-
 .../geode/internal/cache/ProxyBucketRegion.java |   6 +-
 .../geode/internal/cache/ProxyRegionMap.java    |   2 +-
 .../geode/internal/cache/RegionExpiryTask.java  |  18 +--
 .../internal/cache/RegionIdleExpiryTask.java    |   2 +-
 .../internal/cache/RegionTTLExpiryTask.java     |   2 +-
 .../cache/RemoteContainsKeyValueMessage.java    |   4 +-
 .../internal/cache/RemoteDestroyMessage.java    |  12 +-
 .../internal/cache/RemoteFetchEntryMessage.java |   4 +-
 .../cache/RemoteFetchVersionMessage.java        |   4 +-
 .../geode/internal/cache/RemoteGetMessage.java  |  10 +-
 .../internal/cache/RemoteInvalidateMessage.java |   4 +-
 .../internal/cache/RemotePutAllMessage.java     |  13 +-
 .../geode/internal/cache/RemotePutMessage.java  |  34 ++--
 .../internal/cache/RemoteRegionOperation.java   |   4 +-
 .../internal/cache/RemoteRemoveAllMessage.java  |  11 +-
 .../geode/internal/cache/RoleEventImpl.java     |   2 +-
 .../cache/SearchLoadAndWriteProcessor.java      |  16 +-
 .../internal/cache/StateFlushOperation.java     |   7 +-
 .../apache/geode/internal/cache/TXEntry.java    |   4 +-
 .../geode/internal/cache/TXEntryState.java      |  42 ++---
 .../internal/cache/TXFarSideCMTracker.java      |  20 +--
 .../org/apache/geode/internal/cache/TXId.java   |   2 +-
 .../internal/cache/TXRemoteCommitMessage.java   |   2 +-
 .../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  |  12 +-
 .../internal/cache/UnsharedImageState.java      |   2 +-
 .../cache/UpdateAttributesProcessor.java        |   4 +-
 .../geode/internal/cache/UpdateOperation.java   |   4 +-
 .../internal/cache/VMCachedDeserializable.java  |   2 +-
 .../geode/internal/cache/VMLRURegionMap.java    |  10 +-
 .../geode/internal/cache/VMRegionMap.java       |   2 +-
 .../VMStatsDiskLRURegionEntryHeapIntKey.java    | 145 +++++++++++------
 .../VMStatsDiskLRURegionEntryHeapLongKey.java   | 143 ++++++++++------
 .../VMStatsDiskLRURegionEntryHeapObjectKey.java | 141 ++++++++++------
 ...VMStatsDiskLRURegionEntryHeapStringKey1.java | 141 ++++++++++------
 ...VMStatsDiskLRURegionEntryHeapStringKey2.java | 140 ++++++++++------
 .../VMStatsDiskLRURegionEntryHeapUUIDKey.java   | 144 +++++++++++------
 .../VMStatsDiskLRURegionEntryOffHeapIntKey.java | 153 ++++++++++++------
 ...VMStatsDiskLRURegionEntryOffHeapLongKey.java | 151 +++++++++++------
 ...StatsDiskLRURegionEntryOffHeapObjectKey.java | 150 +++++++++++------
 ...tatsDiskLRURegionEntryOffHeapStringKey1.java | 150 +++++++++++------
 ...tatsDiskLRURegionEntryOffHeapStringKey2.java | 149 +++++++++++------
 ...VMStatsDiskLRURegionEntryOffHeapUUIDKey.java | 152 +++++++++++------
 .../cache/VMStatsDiskRegionEntryHeapIntKey.java |  85 +++++++---
 .../VMStatsDiskRegionEntryHeapLongKey.java      |  83 +++++++---
 .../VMStatsDiskRegionEntryHeapObjectKey.java    |  82 +++++++---
 .../VMStatsDiskRegionEntryHeapStringKey1.java   |  83 +++++++---
 .../VMStatsDiskRegionEntryHeapStringKey2.java   |  82 +++++++---
 .../VMStatsDiskRegionEntryHeapUUIDKey.java      |  84 +++++++---
 .../VMStatsDiskRegionEntryOffHeapIntKey.java    |  93 ++++++++---
 .../VMStatsDiskRegionEntryOffHeapLongKey.java   |  91 ++++++++---
 .../VMStatsDiskRegionEntryOffHeapObjectKey.java |  90 ++++++++---
 ...VMStatsDiskRegionEntryOffHeapStringKey1.java |  90 ++++++++---
 ...VMStatsDiskRegionEntryOffHeapStringKey2.java |  89 +++++++---
 .../VMStatsDiskRegionEntryOffHeapUUIDKey.java   |  92 ++++++++---
 .../cache/VMStatsLRURegionEntryHeapIntKey.java  | 132 ++++++++++-----
 .../cache/VMStatsLRURegionEntryHeapLongKey.java | 130 ++++++++++-----
 .../VMStatsLRURegionEntryHeapObjectKey.java     | 130 ++++++++++-----
 .../VMStatsLRURegionEntryHeapStringKey1.java    | 130 +++++++++------
 .../VMStatsLRURegionEntryHeapStringKey2.java    | 129 +++++++++------
 .../cache/VMStatsLRURegionEntryHeapUUIDKey.java | 129 ++++++++++-----
 .../VMStatsLRURegionEntryOffHeapIntKey.java     | 140 +++++++++++-----
 .../VMStatsLRURegionEntryOffHeapLongKey.java    | 138 +++++++++++-----
 .../VMStatsLRURegionEntryOffHeapObjectKey.java  | 138 +++++++++++-----
 .../VMStatsLRURegionEntryOffHeapStringKey1.java | 137 +++++++++++-----
 .../VMStatsLRURegionEntryOffHeapStringKey2.java | 136 +++++++++++-----
 .../VMStatsLRURegionEntryOffHeapUUIDKey.java    | 137 +++++++++++-----
 .../cache/VMStatsRegionEntryHeapIntKey.java     |  73 +++++++--
 .../cache/VMStatsRegionEntryHeapLongKey.java    |  71 ++++++--
 .../cache/VMStatsRegionEntryHeapObjectKey.java  |  71 ++++++--
 .../cache/VMStatsRegionEntryHeapStringKey1.java |  71 ++++++--
 .../cache/VMStatsRegionEntryHeapStringKey2.java |  70 ++++++--
 .../cache/VMStatsRegionEntryHeapUUIDKey.java    |  70 ++++++--
 .../cache/VMStatsRegionEntryOffHeapIntKey.java  |  81 ++++++++--
 .../cache/VMStatsRegionEntryOffHeapLongKey.java |  79 +++++++--
 .../VMStatsRegionEntryOffHeapObjectKey.java     |  79 +++++++--
 .../VMStatsRegionEntryOffHeapStringKey1.java    |  78 +++++++--
 .../VMStatsRegionEntryOffHeapStringKey2.java    |  77 +++++++--
 .../cache/VMStatsRegionEntryOffHeapUUIDKey.java |  78 +++++++--
 .../VMThinDiskLRURegionEntryHeapIntKey.java     | 123 +++++++++-----
 .../VMThinDiskLRURegionEntryHeapLongKey.java    | 121 +++++++++-----
 .../VMThinDiskLRURegionEntryHeapObjectKey.java  | 119 +++++++++-----
 .../VMThinDiskLRURegionEntryHeapStringKey1.java | 119 +++++++++-----
 .../VMThinDiskLRURegionEntryHeapStringKey2.java | 118 +++++++++-----
 .../VMThinDiskLRURegionEntryHeapUUIDKey.java    | 122 +++++++++-----
 .../VMThinDiskLRURegionEntryOffHeapIntKey.java  | 131 ++++++++++-----
 .../VMThinDiskLRURegionEntryOffHeapLongKey.java | 129 ++++++++++-----
 ...MThinDiskLRURegionEntryOffHeapObjectKey.java | 128 ++++++++++-----
 ...ThinDiskLRURegionEntryOffHeapStringKey1.java | 128 ++++++++++-----
 ...ThinDiskLRURegionEntryOffHeapStringKey2.java | 127 ++++++++++-----
 .../VMThinDiskLRURegionEntryOffHeapUUIDKey.java | 130 ++++++++++-----
 .../cache/VMThinDiskRegionEntryHeapIntKey.java  |  62 +++++--
 .../cache/VMThinDiskRegionEntryHeapLongKey.java |  60 +++++--
 .../VMThinDiskRegionEntryHeapObjectKey.java     |  59 +++++--
 .../VMThinDiskRegionEntryHeapStringKey1.java    |  60 +++++--
 .../VMThinDiskRegionEntryHeapStringKey2.java    |  59 +++++--
 .../cache/VMThinDiskRegionEntryHeapUUIDKey.java |  61 +++++--
 .../VMThinDiskRegionEntryOffHeapIntKey.java     |  70 ++++++--
 .../VMThinDiskRegionEntryOffHeapLongKey.java    |  68 ++++++--
 .../VMThinDiskRegionEntryOffHeapObjectKey.java  |  67 ++++++--
 .../VMThinDiskRegionEntryOffHeapStringKey1.java |  67 ++++++--
 .../VMThinDiskRegionEntryOffHeapStringKey2.java |  66 ++++++--
 .../VMThinDiskRegionEntryOffHeapUUIDKey.java    |  69 ++++++--
 .../cache/VMThinLRURegionEntryHeapIntKey.java   | 110 ++++++++-----
 .../cache/VMThinLRURegionEntryHeapLongKey.java  | 108 ++++++++-----
 .../VMThinLRURegionEntryHeapObjectKey.java      | 108 ++++++++-----
 .../VMThinLRURegionEntryHeapStringKey1.java     | 108 ++++++++-----
 .../VMThinLRURegionEntryHeapStringKey2.java     | 107 +++++++-----
 .../cache/VMThinLRURegionEntryHeapUUIDKey.java  | 107 +++++++-----
 .../VMThinLRURegionEntryOffHeapIntKey.java      | 118 +++++++++-----
 .../VMThinLRURegionEntryOffHeapLongKey.java     | 116 ++++++++-----
 .../VMThinLRURegionEntryOffHeapObjectKey.java   | 116 ++++++++-----
 .../VMThinLRURegionEntryOffHeapStringKey1.java  | 115 ++++++++-----
 .../VMThinLRURegionEntryOffHeapStringKey2.java  | 114 ++++++++-----
 .../VMThinLRURegionEntryOffHeapUUIDKey.java     | 115 ++++++++-----
 .../cache/VMThinRegionEntryHeapIntKey.java      |  50 +++++-
 .../cache/VMThinRegionEntryHeapLongKey.java     |  48 +++++-
 .../cache/VMThinRegionEntryHeapObjectKey.java   |  48 +++++-
 .../cache/VMThinRegionEntryHeapStringKey1.java  |  48 ++++--
 .../cache/VMThinRegionEntryHeapStringKey2.java  |  47 ++++--
 .../cache/VMThinRegionEntryHeapUUIDKey.java     |  47 +++++-
 .../cache/VMThinRegionEntryOffHeapIntKey.java   |  58 ++++++-
 .../cache/VMThinRegionEntryOffHeapLongKey.java  |  56 ++++++-
 .../VMThinRegionEntryOffHeapObjectKey.java      |  56 ++++++-
 .../VMThinRegionEntryOffHeapStringKey1.java     |  55 ++++++-
 .../VMThinRegionEntryOffHeapStringKey2.java     |  54 ++++++-
 .../cache/VMThinRegionEntryOffHeapUUIDKey.java  |  55 ++++++-
 ...sionedStatsDiskLRURegionEntryHeapIntKey.java | 153 ++++++++++++------
 ...ionedStatsDiskLRURegionEntryHeapLongKey.java | 151 +++++++++++------
 ...nedStatsDiskLRURegionEntryHeapObjectKey.java | 150 +++++++++++------
 ...edStatsDiskLRURegionEntryHeapStringKey1.java | 150 +++++++++++------
 ...edStatsDiskLRURegionEntryHeapStringKey2.java | 149 +++++++++++------
 ...ionedStatsDiskLRURegionEntryHeapUUIDKey.java | 152 +++++++++++------
 ...nedStatsDiskLRURegionEntryOffHeapIntKey.java | 162 +++++++++++++------
 ...edStatsDiskLRURegionEntryOffHeapLongKey.java | 160 ++++++++++++------
 ...StatsDiskLRURegionEntryOffHeapObjectKey.java | 159 ++++++++++++------
 ...tatsDiskLRURegionEntryOffHeapStringKey1.java | 159 ++++++++++++------
 ...tatsDiskLRURegionEntryOffHeapStringKey2.java | 158 ++++++++++++------
 ...edStatsDiskLRURegionEntryOffHeapUUIDKey.java | 161 ++++++++++++------
 ...VersionedStatsDiskRegionEntryHeapIntKey.java |  93 ++++++++---
 ...ersionedStatsDiskRegionEntryHeapLongKey.java |  91 ++++++++---
 ...sionedStatsDiskRegionEntryHeapObjectKey.java |  90 ++++++++---
 ...ionedStatsDiskRegionEntryHeapStringKey1.java |  90 ++++++++---
 ...ionedStatsDiskRegionEntryHeapStringKey2.java |  89 +++++++---
 ...ersionedStatsDiskRegionEntryHeapUUIDKey.java |  92 ++++++++---
 ...sionedStatsDiskRegionEntryOffHeapIntKey.java | 102 +++++++++---
 ...ionedStatsDiskRegionEntryOffHeapLongKey.java | 100 +++++++++---
 ...nedStatsDiskRegionEntryOffHeapObjectKey.java |  99 +++++++++---
 ...edStatsDiskRegionEntryOffHeapStringKey1.java |  99 +++++++++---
 ...edStatsDiskRegionEntryOffHeapStringKey2.java |  98 ++++++++---
 ...ionedStatsDiskRegionEntryOffHeapUUIDKey.java | 101 +++++++++---
 .../VersionedStatsLRURegionEntryHeapIntKey.java | 141 ++++++++++------
 ...VersionedStatsLRURegionEntryHeapLongKey.java | 138 ++++++++++------
 ...rsionedStatsLRURegionEntryHeapObjectKey.java | 138 ++++++++++------
 ...sionedStatsLRURegionEntryHeapStringKey1.java | 137 ++++++++++------
 ...sionedStatsLRURegionEntryHeapStringKey2.java | 136 ++++++++++------
 ...VersionedStatsLRURegionEntryHeapUUIDKey.java | 137 ++++++++++------
 ...rsionedStatsLRURegionEntryOffHeapIntKey.java | 149 +++++++++++------
 ...sionedStatsLRURegionEntryOffHeapLongKey.java | 147 +++++++++++------
 ...onedStatsLRURegionEntryOffHeapObjectKey.java | 147 +++++++++++------
 ...nedStatsLRURegionEntryOffHeapStringKey1.java | 146 +++++++++++------
 ...nedStatsLRURegionEntryOffHeapStringKey2.java | 145 +++++++++++------
 ...sionedStatsLRURegionEntryOffHeapUUIDKey.java | 146 +++++++++++------
 .../VersionedStatsRegionEntryHeapIntKey.java    |  82 ++++++++--
 .../VersionedStatsRegionEntryHeapLongKey.java   |  80 +++++++--
 .../VersionedStatsRegionEntryHeapObjectKey.java |  79 +++++++--
 ...VersionedStatsRegionEntryHeapStringKey1.java |  78 +++++++--
 ...VersionedStatsRegionEntryHeapStringKey2.java |  77 +++++++--
 .../VersionedStatsRegionEntryHeapUUIDKey.java   |  79 +++++++--
 .../VersionedStatsRegionEntryOffHeapIntKey.java |  90 +++++++++--
 ...VersionedStatsRegionEntryOffHeapLongKey.java |  88 ++++++++--
 ...rsionedStatsRegionEntryOffHeapObjectKey.java |  88 ++++++++--
 ...sionedStatsRegionEntryOffHeapStringKey1.java |  87 ++++++++--
 ...sionedStatsRegionEntryOffHeapStringKey2.java |  86 ++++++++--
 ...VersionedStatsRegionEntryOffHeapUUIDKey.java |  87 ++++++++--
 ...rsionedThinDiskLRURegionEntryHeapIntKey.java | 131 ++++++++++-----
 ...sionedThinDiskLRURegionEntryHeapLongKey.java | 129 ++++++++++-----
 ...onedThinDiskLRURegionEntryHeapObjectKey.java | 128 ++++++++++-----
 ...nedThinDiskLRURegionEntryHeapStringKey1.java | 128 ++++++++++-----
 ...nedThinDiskLRURegionEntryHeapStringKey2.java | 127 ++++++++++-----
 ...sionedThinDiskLRURegionEntryHeapUUIDKey.java | 130 ++++++++++-----
 ...onedThinDiskLRURegionEntryOffHeapIntKey.java | 140 +++++++++++-----
 ...nedThinDiskLRURegionEntryOffHeapLongKey.java | 138 +++++++++++-----
 ...dThinDiskLRURegionEntryOffHeapObjectKey.java | 137 +++++++++++-----
 ...ThinDiskLRURegionEntryOffHeapStringKey1.java | 137 +++++++++++-----
 ...ThinDiskLRURegionEntryOffHeapStringKey2.java | 136 +++++++++++-----
 ...nedThinDiskLRURegionEntryOffHeapUUIDKey.java | 139 +++++++++++-----
 .../VersionedThinDiskRegionEntryHeapIntKey.java |  71 ++++++--
 ...VersionedThinDiskRegionEntryHeapLongKey.java |  68 ++++++--
 ...rsionedThinDiskRegionEntryHeapObjectKey.java |  67 ++++++--
 ...sionedThinDiskRegionEntryHeapStringKey1.java |  67 ++++++--
 ...sionedThinDiskRegionEntryHeapStringKey2.java |  66 ++++++--
 ...VersionedThinDiskRegionEntryHeapUUIDKey.java |  69 ++++++--
 ...rsionedThinDiskRegionEntryOffHeapIntKey.java |  79 +++++++--
 ...sionedThinDiskRegionEntryOffHeapLongKey.java |  77 +++++++--
 ...onedThinDiskRegionEntryOffHeapObjectKey.java |  76 +++++++--
 ...nedThinDiskRegionEntryOffHeapStringKey1.java |  76 +++++++--
 ...nedThinDiskRegionEntryOffHeapStringKey2.java |  75 +++++++--
 ...sionedThinDiskRegionEntryOffHeapUUIDKey.java |  78 +++++++--
 .../VersionedThinLRURegionEntryHeapIntKey.java  | 119 +++++++++-----
 .../VersionedThinLRURegionEntryHeapLongKey.java | 116 ++++++++-----
 ...ersionedThinLRURegionEntryHeapObjectKey.java | 116 ++++++++-----
 ...rsionedThinLRURegionEntryHeapStringKey1.java | 115 ++++++++-----
 ...rsionedThinLRURegionEntryHeapStringKey2.java | 114 ++++++++-----
 .../VersionedThinLRURegionEntryHeapUUIDKey.java | 115 ++++++++-----
 ...ersionedThinLRURegionEntryOffHeapIntKey.java | 127 ++++++++++-----
 ...rsionedThinLRURegionEntryOffHeapLongKey.java | 125 +++++++++-----
 ...ionedThinLRURegionEntryOffHeapObjectKey.java | 125 +++++++++-----
 ...onedThinLRURegionEntryOffHeapStringKey1.java | 124 +++++++++-----
 ...onedThinLRURegionEntryOffHeapStringKey2.java | 123 +++++++++-----
 ...rsionedThinLRURegionEntryOffHeapUUIDKey.java | 124 +++++++++-----
 .../VersionedThinRegionEntryHeapIntKey.java     |  59 +++++--
 .../VersionedThinRegionEntryHeapLongKey.java    |  57 +++++--
 .../VersionedThinRegionEntryHeapObjectKey.java  |  56 +++++--
 .../VersionedThinRegionEntryHeapStringKey1.java |  55 +++++--
 .../VersionedThinRegionEntryHeapStringKey2.java |  54 +++++--
 .../VersionedThinRegionEntryHeapUUIDKey.java    |  56 +++++--
 .../VersionedThinRegionEntryOffHeapIntKey.java  |  67 ++++++--
 .../VersionedThinRegionEntryOffHeapLongKey.java |  65 ++++++--
 ...ersionedThinRegionEntryOffHeapObjectKey.java |  65 ++++++--
 ...rsionedThinRegionEntryOffHeapStringKey1.java |  64 ++++++--
 ...rsionedThinRegionEntryOffHeapStringKey2.java |  63 ++++++--
 .../VersionedThinRegionEntryOffHeapUUIDKey.java |  64 ++++++--
 .../cache/control/HeapMemoryMonitor.java        |   2 +-
 .../cache/control/MemoryThresholds.java         |   2 +-
 .../cache/execute/AbstractExecution.java        |  21 ++-
 .../cache/execute/FunctionContextImpl.java      |   2 +-
 .../execute/MemberFunctionResultSender.java     |   2 +-
 .../geode/internal/cache/execute/NoResult.java  |   2 +-
 .../PartitionedRegionFunctionResultSender.java  |   2 +-
 .../internal/cache/ha/QueueRemovalMessage.java  |   2 +-
 .../geode/internal/cache/locks/TXLockBatch.java |   2 +-
 .../internal/cache/locks/TXLockIdImpl.java      |   6 +-
 .../locks/TXLockUpdateParticipantsMessage.java  |   4 +-
 .../locks/TXOriginatorRecoveryProcessor.java    |   4 +-
 .../internal/cache/lru/HeapLRUStatistics.java   |   4 +-
 .../cache/lru/LRUCapacityController.java        |   2 +-
 .../cache/lru/MemLRUCapacityController.java     |   2 +-
 .../internal/cache/lru/NewLRUClockHand.java     |   4 +-
 .../AllBucketProfilesUpdateMessage.java         |   4 +-
 .../partitioned/BecomePrimaryBucketMessage.java |   6 +-
 .../cache/partitioned/BucketBackupMessage.java  |   2 +-
 .../partitioned/BucketProfileUpdateMessage.java |   5 +-
 .../cache/partitioned/BucketSizeMessage.java    |   6 +-
 .../partitioned/ContainsKeyValueMessage.java    |   4 +-
 .../cache/partitioned/CreateBucketMessage.java  |   6 +-
 .../partitioned/CreateMissingBucketsTask.java   |   2 +-
 .../partitioned/DeposePrimaryBucketMessage.java |   2 +-
 .../cache/partitioned/DestroyMessage.java       |   8 +-
 .../DestroyRegionOnDataStoreMessage.java        |   6 +-
 .../partitioned/DumpAllPRConfigMessage.java     |   2 +-
 .../cache/partitioned/DumpB2NRegion.java        |   4 +-
 .../cache/partitioned/DumpBucketsMessage.java   |   2 +-
 .../partitioned/EndBucketCreationMessage.java   |   4 +-
 .../partitioned/FetchBulkEntriesMessage.java    |   4 +-
 .../cache/partitioned/FetchEntriesMessage.java  |   4 +-
 .../cache/partitioned/FetchEntryMessage.java    |   4 +-
 .../cache/partitioned/FetchKeysMessage.java     |   4 +-
 .../FetchPartitionDetailsMessage.java           |   2 +-
 .../cache/partitioned/FlushMessage.java         |   2 +-
 .../internal/cache/partitioned/GetMessage.java  |  10 +-
 .../partitioned/IdentityRequestMessage.java     |   4 +-
 .../partitioned/IdentityUpdateMessage.java      |   2 +-
 .../cache/partitioned/IndexCreationMsg.java     |  14 +-
 .../cache/partitioned/InterestEventMessage.java |   6 +-
 .../cache/partitioned/InvalidateMessage.java    |   4 +-
 .../partitioned/ManageBackupBucketMessage.java  |   6 +-
 .../cache/partitioned/ManageBucketMessage.java  |   6 +-
 .../cache/partitioned/MoveBucketMessage.java    |   2 +-
 .../internal/cache/partitioned/PRLoad.java      |   2 +-
 .../cache/partitioned/PRSanityCheckMessage.java |   2 +-
 .../cache/partitioned/PRTombstoneMessage.java   |   6 +-
 .../PRUpdateEntryVersionMessage.java            |   2 +-
 .../cache/partitioned/PartitionMessage.java     |  12 +-
 ...rtitionedRegionFunctionStreamingMessage.java |   2 +-
 .../PartitionedRegionObserverHolder.java        |   4 +-
 .../partitioned/PrimaryRequestMessage.java      |   4 +-
 .../internal/cache/partitioned/PutMessage.java  |  28 ++--
 .../cache/partitioned/QueryMessage.java         |   2 +-
 .../cache/partitioned/RegionAdvisor.java        |  16 +-
 .../cache/partitioned/RemoteSizeMessage.java    |   6 +-
 .../cache/partitioned/RemoveAllPRMessage.java   |  14 +-
 .../cache/partitioned/RemoveBucketMessage.java  |   2 +-
 .../cache/partitioned/RemoveIndexesMessage.java |  14 +-
 .../internal/cache/partitioned/SizeMessage.java |   4 +-
 .../cache/persistence/BytesAndBits.java         |   4 +-
 .../persistence/MembershipViewRequest.java      |   2 +-
 .../snapshot/RegionSnapshotServiceImpl.java     |   4 +-
 .../cache/tier/InternalClientMembership.java    |   2 +-
 .../cache/tier/sockets/BaseCommand.java         |   2 +-
 .../tier/sockets/CacheClientNotifierStats.java  |  24 +--
 .../tier/sockets/CacheClientProxyStats.java     |   4 +-
 .../tier/sockets/ClientInstantiatorMessage.java |   2 +-
 .../tier/sockets/ClientMarkerMessageImpl.java   |   2 +-
 .../tier/sockets/ClientPingMessageImpl.java     |   2 +-
 .../internal/cache/tier/sockets/HandShake.java  |   2 +-
 .../tier/sockets/InterestResultPolicyImpl.java  |   2 +-
 .../internal/cache/tier/sockets/Message.java    |   2 +-
 .../geode/internal/cache/tier/sockets/Part.java |   4 +-
 .../cache/tier/sockets/ServerConnection.java    |   2 +-
 .../tier/sockets/UnregisterAllInterest.java     |   2 +-
 .../cache/vmotion/VMotionObserverHolder.java    |   4 +-
 .../cache/wan/AbstractGatewaySender.java        |  14 +-
 .../AbstractGatewaySenderEventProcessor.java    |   4 +-
 .../cache/wan/GatewaySenderAdvisor.java         |   2 +-
 .../wan/GatewaySenderEventCallbackArgument.java |   2 +-
 .../parallel/ParallelGatewaySenderQueue.java    |  12 +-
 .../ParallelQueueBatchRemovalMessage.java       |   2 +-
 .../wan/serial/SerialGatewaySenderQueue.java    |  12 +-
 .../geode/internal/cache/xmlcache/CacheXml.java |  16 +-
 .../cache/xmlcache/GeodeEntityResolver.java     |   2 +-
 .../cache/xmlcache/PivotalEntityResolver.java   |   2 +-
 .../cache/xmlcache/XmlGeneratorUtils.java       |   2 +-
 .../geode/internal/concurrent/AtomicLong5.java  |   2 +-
 .../concurrent/CompactConcurrentHashSet2.java   |  82 +++++-----
 .../geode/internal/logging/DateFormatter.java   |   2 +-
 .../geode/internal/logging/GemFireHandler.java  |   2 +-
 .../geode/internal/logging/PureLogWriter.java   |   4 +-
 .../internal/logging/SecurityLogWriter.java     |   2 +-
 .../logging/SecurityManagerLogWriter.java       |   2 +-
 .../internal/logging/log4j/AlertAppender.java   |   2 +-
 .../logging/log4j/LocalizedMessage.java         |  10 +-
 .../logging/log4j/LogWriterAppender.java        |   2 +-
 .../internal/logging/log4j/LogWriterLogger.java |   2 +-
 .../logging/log4j/ThreadIdPatternConverter.java |   2 +-
 .../GemFireParameterizedMessageFactory.java     |   2 +-
 .../geode/internal/net/SocketCreator.java       |   2 +-
 .../apache/geode/internal/offheap/DataType.java |   2 +-
 .../geode/internal/offheap/FreeListManager.java |   2 +-
 .../internal/process/AttachProcessUtils.java    |   2 +-
 .../process/BlockingProcessStreamReader.java    |   2 +-
 ...usterConfigurationNotAvailableException.java |   2 +-
 .../process/ConnectionFailedException.java      |   2 +-
 .../internal/process/ControlFileWatchdog.java   |   2 +-
 .../internal/process/ControllableProcess.java   |   2 +-
 .../process/FileAlreadyExistsException.java     |   2 +-
 .../process/LocalProcessController.java         |   2 +-
 .../internal/process/LocalProcessLauncher.java  |   2 +-
 .../process/MBeanInvocationFailedException.java |   2 +-
 .../process/MBeanProcessController.java         |   2 +-
 .../internal/process/NativeProcessUtils.java    |   2 +-
 .../process/NonBlockingProcessStreamReader.java |   2 +-
 .../process/PidUnavailableException.java        |   2 +-
 .../process/ProcessControllerFactory.java       |   2 +-
 .../process/ProcessLauncherContext.java         |   2 +-
 .../ProcessTerminatedAbnormallyException.java   |   2 +-
 .../geode/internal/process/ProcessUtils.java    |   2 +-
 .../UnableToControlProcessException.java        |   2 +-
 .../geode/internal/shared/NativeCalls.java      |   6 +-
 .../internal/shared/NativeCallsJNAImpl.java     |  10 +-
 .../internal/shared/NativeErrorException.java   |   2 +-
 .../apache/geode/internal/shared/OSType.java    |   2 +-
 .../statistics/AbstractStatisticsFactory.java   |  74 ++++-----
 .../internal/statistics/CounterMonitor.java     |   2 +-
 .../statistics/DummyStatisticsImpl.java         |  80 ++++-----
 .../geode/internal/statistics/GaugeMonitor.java |   2 +-
 .../internal/statistics/GemFireStatSampler.java |  30 ++--
 .../internal/statistics/HostStatSampler.java    |  40 ++---
 .../statistics/LocalStatisticsImpl.java         |  26 +--
 .../internal/statistics/SampleCollector.java    |   2 +-
 .../internal/statistics/SimpleStatisticId.java  |   6 +-
 .../internal/statistics/StatArchiveReader.java  |   2 +-
 .../internal/statistics/StatArchiveWriter.java  |  34 ++--
 .../statistics/StatisticDescriptorImpl.java     |  36 ++---
 .../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 +++---
 .../geode/internal/tcp/MsgStreamerList.java     |   2 +-
 .../internal/tcp/VersionedMsgStreamer.java      |   4 +-
 .../geode/internal/util/CollectionUtils.java    |   4 +-
 .../geode/internal/util/TransformUtils.java     |   2 +-
 .../CustomEntryConcurrentHashMap.java           | 146 ++++++++---------
 .../geode/management/cli/CommandService.java    |   4 +-
 .../geode/management/internal/AlertDetails.java |   2 +-
 .../management/internal/ArrayConverter.java     |   6 +-
 .../internal/CollectionConverter.java           |   6 +-
 .../management/internal/CompositeConverter.java |   4 +-
 .../management/internal/EnumConverter.java      |   6 +-
 .../management/internal/IdentityConverter.java  |   4 +-
 .../geode/management/internal/OpenMethod.java   |  12 +-
 .../management/internal/OpenTypeConverter.java  |  22 ++-
 .../internal/SystemManagementService.java       |   2 +-
 .../management/internal/TableConverter.java     |   6 +-
 .../internal/beans/stats/VMStatsMonitor.java    |   2 +-
 .../geode/management/internal/cli/Launcher.java |   2 +-
 .../internal/cli/commands/DeployCommands.java   |  10 +-
 .../cli/commands/LauncherLifecycleCommands.java |   2 +-
 .../internal/cli/commands/StatusCommands.java   |   2 +-
 .../cli/functions/ExportedLogsSizeInfo.java     |   2 +-
 .../cli/util/RegionAttributesDefault.java       |   2 +-
 .../configuration/domain/CacheElement.java      |   6 +-
 .../configuration/domain/XmlEntity.java         |  12 +-
 .../configuration/utils/XmlConstants.java       |   2 +-
 .../internal/configuration/utils/XmlUtils.java  |  16 +-
 .../web/io/MultipartFileResourceAdapter.java    |   2 +-
 .../web/shell/AbstractHttpOperationInvoker.java |   6 +-
 .../shell/support/HttpInvocationHandler.java    |   4 +-
 .../pdx/ReflectionBasedAutoSerializer.java      |  10 +-
 .../pdx/internal/AutoSerializableManager.java   |  48 +++---
 .../apache/geode/redis/GeodeRedisServer.java    |   2 +-
 .../org/apache/geode/redis/internal/Coder.java  |  31 ++--
 .../geode/redis/internal/RegionProvider.java    |   8 +-
 .../internal/executor/hll/HllExecutor.java      |   2 +-
 .../redis/internal/executor/hll/Varint.java     |   2 +-
 .../internal/executor/list/ListExecutor.java    |   2 +-
 .../executor/sortedset/ZRangeByLexExecutor.java |   2 +-
 .../executor/string/StringExecutor.java         |   2 +-
 .../security/GemFireSecurityException.java      |   6 +-
 .../ClientServerRegisterInterestsDUnitTest.java |   2 +-
 .../management/MemoryThresholdsDUnitTest.java   |   2 +-
 ...rrentIndexInitOnOverflowRegionDUnitTest.java |   2 +-
 .../PRColocatedEquiJoinDUnitTest.java           |   4 +-
 .../query/partitioned/PRQueryDUnitHelper.java   |   2 +-
 .../geode/cache/snapshot/SnapshotDUnitTest.java |   2 +-
 .../cache30/ClientMembershipDUnitTest.java      |   2 +-
 .../geode/codeAnalysis/decode/cp/CpUtf8.java    |   2 +-
 .../geode/distributed/AbstractLauncherTest.java |   2 +-
 .../geode/distributed/ServerLauncherTest.java   |   2 +-
 .../distributed/internal/Bug40751DUnitTest.java |   2 +-
 .../auth/AbstractGMSAuthenticatorTestCase.java  |  16 +-
 .../StreamingOperationManyDUnitTest.java        |   2 +-
 .../StreamingOperationOneDUnitTest.java         |   2 +-
 .../disttx/DistributedTransactionDUnitTest.java |  10 +-
 ...wardCompatibilitySerializationDUnitTest.java |   2 +-
 .../apache/geode/internal/cache/TestDelta.java  |   2 +-
 .../extension/mock/MockCacheExtension.java      |   2 +-
 .../mock/MockCacheExtensionXmlGenerator.java    |   2 +-
 .../extension/mock/MockRegionExtension.java     |   2 +-
 .../mock/MockRegionExtensionXmlGenerator.java   |   2 +-
 .../cache/partitioned/Bug39356DUnitTest.java    |   3 +-
 .../PersistentPartitionedRegionDUnitTest.java   |   3 +-
 ...treamingPartitionOperationManyDUnitTest.java |   2 +-
 ...StreamingPartitionOperationOneDUnitTest.java |   2 +-
 .../asyncqueue/AsyncEventListenerDUnitTest.java |   2 +-
 .../ParallelQueueRemovalMessageJUnitTest.java   |   2 +-
 .../xmlcache/AbstractXmlParserJUnitTest.java    |   2 +-
 .../compression/CompressionStatsDUnitTest.java  |   4 +-
 .../internal/lang/ObjectUtilsJUnitTest.java     |   2 +-
 .../internal/lang/ThreadUtilsJUnitTest.java     |   2 +-
 .../offheap/LifecycleListenerJUnitTest.java     |   2 +-
 ...tractSignalNotificationHandlerJUnitTest.java |   3 +-
 .../geode/internal/util/IOUtilsJUnitTest.java   |   2 +-
 .../util/concurrent/cm/LoopHelpers.java         |   6 +-
 ...ersalMembershipListenerAdapterDUnitTest.java |   2 +-
 ...WithCacheLoaderDuringCacheMissDUnitTest.java |   2 +-
 .../management/internal/cli/domain/Stock.java   |   2 +-
 .../DeltaClientAuthorizationDUnitTest.java      |   2 +-
 .../geode/security/SecurityTestUtils.java       |   2 +-
 .../generator/AuthzCredentialGenerator.java     |   2 +-
 .../security/generator/CredentialGenerator.java |   2 +-
 .../cache/internal/JUnit4CacheTestCase.java     |   2 +-
 .../cache/query/internal/cq/CqConflatable.java  |  20 +--
 .../cache/query/internal/cq/CqServiceImpl.java  |   2 +-
 .../internal/directory/FileIndexInput.java      |   2 +-
 .../internal/filesystem/FileInputStream.java    |   2 +-
 .../internal/filesystem/FileOutputStream.java   |   2 +-
 .../internal/xml/LuceneServiceXmlGenerator.java |   2 +-
 .../filesystem/FileSystemJUnitTest.java         |   4 +-
 .../tools/pulse/tests/ui/PulseTestUtils.java    |   2 +-
 .../internal/locator/wan/LocatorDiscovery.java  |   2 +-
 ...stomMappingJackson2HttpMessageConverter.java |   5 +-
 .../LoginHandlerInterceptorJUnitTest.java       |   3 +-
 .../RestHttpOperationInvokerJUnitTest.java      |   2 +-
 .../SimpleHttpOperationInvokerJUnitTest.java    |   2 +-
 693 files changed, 16295 insertions(+), 7137 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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/a4458531/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/a4458531/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/a4458531/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
index 8afafdb..012388b 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
@@ -74,7 +74,7 @@ public class SystemMemberCacheEventProcessor {
   }
 
 
-  public static final class SystemMemberCacheMessage extends HighPriorityDistributionMessage {
+  public static class SystemMemberCacheMessage extends HighPriorityDistributionMessage {
     protected String regionPath;
     protected Operation op;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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/a4458531/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
index c1f49c5..0411e0a 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.cache.xmlcache.CacheXml;
  * @deprecated as of 6.5 use {@link DiskStoreFactory} instead
  */
 @Deprecated
-public final class DiskWriteAttributesFactory implements java.io.Serializable {
+public class DiskWriteAttributesFactory implements java.io.Serializable {
   private static final long serialVersionUID = -4077746249663727235L;
 
   private final Properties props = new Properties();

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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..593375e 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,8 +323,8 @@ 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,
-      ChunkHandler callback) throws Exception {
+  protected void processChunkedResponse(ChunkedMessage msg, String opName, ChunkHandler callback)
+      throws Exception {
     msg.readHeader();
     final int msgType = msg.getMessageType();
     if (msgType == MessageType.RESPONSE) {
@@ -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/a4458531/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 3cf0d7b..3502757 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
@@ -52,7 +52,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * 
  * @since GemFire 6.5
  */
-public final class ClientMetadataService {
+public class ClientMetadataService {
 
   private static final Logger logger = LogService.getLogger();
 
@@ -539,7 +539,7 @@ public final class ClientMetadataService {
     }
   }
 
-  public final void getClientPRMetadata(LocalRegion region) {
+  public 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/a4458531/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/a4458531/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/a4458531/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/a4458531/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/a4458531/geode-core/src/main/java/org/apache/geode/cache/operations/internal/UpdateOnlyMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/internal/UpdateOnlyMap.java b/geode-core/src/main/java/org/apache/geode/cache/operations/internal/UpdateOnlyMap.java
index ef54791..a3884c4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/internal/UpdateOnlyMap.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/internal/UpdateOnlyMap.java
@@ -130,7 +130,7 @@ public class UpdateOnlyMap implements Map, Serializable {
     return entrySet;
   }
 
-  private final class EntrySet extends AbstractSet {
+  private class EntrySet extends AbstractSet {
     public Iterator iterator() {
       return new EntryIterator();
     }
@@ -140,6 +140,7 @@ public class UpdateOnlyMap implements Map, Serializable {
       return m.size();
     }
   }
+
   private class EntryIterator implements Iterator {
     private Iterator mIterator = m.entrySet().iterator();
 
@@ -209,7 +210,7 @@ public class UpdateOnlyMap implements Map, Serializable {
     return values;
   }
 
-  private final class Values extends AbstractCollection {
+  private class Values extends AbstractCollection {
     @Override
     public Iterator iterator() {
       return new ValueIterator();

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 26da1a3..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;
@@ -882,13 +882,13 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
 
   }
 
-  private final class KeyIterator extends HashIterator<Object> {
+  private class KeyIterator extends HashIterator<Object> {
     public Object next() {
       return nextEntry().getKey();
     }
   }
 
-  private final class EntryIterator extends HashIterator<Entry> {
+  private class EntryIterator extends HashIterator<Entry> {
     public Entry next() {
       return nextEntry();
     }
@@ -923,7 +923,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
     return (ks != null ? ks : (keySet = new KeySet()));
   }
 
-  private final class KeySet extends AbstractSet<Object> {
+  private class KeySet extends AbstractSet<Object> {
     public Iterator<Object> iterator() {
       return newKeyIterator();
     }
@@ -966,7 +966,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
     return es != null ? es : (entrySet = new EntrySet());
   }
 
-  private final class EntrySet extends AbstractSet<Entry> {
+  private class EntrySet extends AbstractSet<Entry> {
     public Iterator<Entry> iterator() {
       return newEntryIterator();
     }
@@ -1055,7 +1055,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
     return loadFactor;
   }
 
-  private final class IntHashMapStrategy implements HashingStrategy {
+  private class IntHashMapStrategy implements HashingStrategy {
 
     @Override
     public int hashCode(Object o) {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 5730f67..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
@@ -35,7 +35,7 @@ package org.apache.geode.cache.query.internal;
  * 
  * @version $Revision: 1.1 $
  */
-public final class QueryObserverHolder {
+public class QueryObserverHolder {
 
   /**
    * The default 'do-nothing' query observer *
@@ -49,7 +49,7 @@ public final 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 final 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/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
index 6fb7d8d..e4ea56c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
@@ -35,7 +35,7 @@ import org.apache.geode.internal.Version;
  * 
  * @since GemFire 4.0
  */
-public final class ResultsCollectionWrapper implements SelectResults, DataSerializableFixedID {
+public class ResultsCollectionWrapper implements SelectResults, DataSerializableFixedID {
 
   private Collection base;
   private CollectionType collectionType;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
index 209cd10..1e7a2f9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
@@ -37,7 +37,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
  *
  * @since GemFire 4.0
  */
-public final class ResultsSet extends HashSet implements SelectResults, DataSerializableFixedID {
+public class ResultsSet extends HashSet implements SelectResults, DataSerializableFixedID {
   private static final long serialVersionUID = -5423281031630216824L;
   private ObjectType elementType;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
index 05ebea7..db925b9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.Version;
  * 
  * @since GemFire 4.0
  */
-public final class SortedResultSet extends TreeSet
+public class SortedResultSet extends TreeSet
     implements SelectResults, Ordered, DataSerializableFixedID {
   private static final long serialVersionUID = 5184711453750319224L;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
index d1f9fb7..f3fd661 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.Version;
  * 
  * @since GemFire 4.0
  */
-public final class SortedStructSet extends TreeSet
+public class SortedStructSet extends TreeSet
     implements SelectResults, DataSerializableFixedID, Ordered, StructFields {
   private static final long serialVersionUID = -1687142950781718159L;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 a2c4b7f..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
@@ -41,7 +41,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
  * 
  * @since GemFire 5.1
  */
-public final class StructBag extends ResultsBag implements StructFields {
+public class StructBag extends ResultsBag implements StructFields {
   /**
    * Holds value of property modifiable.
    */
@@ -52,12 +52,12 @@ public final 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 final 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 final 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/a4458531/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 984c419..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
@@ -39,7 +39,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
  * 
  * @since GemFire 4.0
  */
-public final class StructSet /* extends ObjectOpenCustomHashSet */ implements Set, SelectResults,
+public class StructSet /* extends ObjectOpenCustomHashSet */ implements Set, SelectResults,
     DataSerializableFixedID, StructFields {
   private static final long serialVersionUID = -1228835506930611510L;
 
@@ -64,7 +64,7 @@ public final class StructSet /* extends ObjectOpenCustomHashSet */ implements Se
   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 final class StructSet /* extends ObjectOpenCustomHashSet */ implements Se
       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/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
index 3ee0428..76a0325 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.Version;
  * 
  */
 
-public final class Undefined implements DataSerializableFixedID, Comparable, Serializable {
+public class Undefined implements DataSerializableFixedID, Comparable, Serializable {
 
   private static final long serialVersionUID = 6643107525908324141L;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 6022b43..361690a 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
@@ -46,7 +46,7 @@ public class HashIndexSet implements Set {
    * optional statistics object to track number of hash collisions and time spent probing based on
    * hash collisions
    */
-  final class HashIndexSetProperties {
+  class HashIndexSetProperties {
     /** the set of Objects */
     final protected transient Object[] set;
     /** used for hashing into the table **/
@@ -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;
     }
@@ -658,7 +658,7 @@ public class HashIndexSet implements Set {
   /**
    * After insert, allows for calculating metadata
    */
-  protected final void postInsertHook(boolean usedFreeSlot) {
+  protected void postInsertHook(boolean usedFreeSlot) {
     if (usedFreeSlot) {
       hashIndexSetProperties.free--;
     } else {
@@ -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/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
index 889c4ec..1f66f0d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
@@ -25,7 +25,7 @@ import org.apache.geode.DataSerializer;
  * 
  * @since GemFire 4.0
  */
-public final class MapTypeImpl extends CollectionTypeImpl implements MapType {
+public class MapTypeImpl extends CollectionTypeImpl implements MapType {
   private static final long serialVersionUID = -705688605389537058L;
   private ObjectType keyType;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
index 7047e12..cef2009 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
  * 
  * @since GemFire 4.0
  */
-public final class StructTypeImpl extends ObjectTypeImpl implements StructType {
+public class StructTypeImpl extends ObjectTypeImpl implements StructType {
   private static final long serialVersionUID = -6368710865627039204L;
   private String[] fieldNames;
   private ObjectType[] fieldTypes;

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java b/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
index 3939fe7..5d936b9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
@@ -27,7 +27,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
  * used to track the events received by <code>AsyncEventListener</code>. If the event has already
  * been seen, <code>AsyncEventListener</code> can choose to ignore it.
  */
-public final class EventSequenceID {
+public class EventSequenceID {
   /**
    * Uniquely identifies the distributed member VM in which the Event is produced
    */

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java b/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
index 05d75e8..6324823 100644
--- a/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
+++ b/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
@@ -26,7 +26,7 @@ import org.iq80.snappy.Snappy;
  * 
  * @since GemFire 8.0
  */
-public final class SnappyCompressor implements Compressor, Serializable {
+public class SnappyCompressor implements Compressor, Serializable {
   private static final long serialVersionUID = 496609875302446099L;
 
   /**

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
index 856a2cd..641e009 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
@@ -63,7 +63,7 @@ import java.util.logging.Level;
  * @since GemFire 7.0
  */
 @SuppressWarnings({"unused"})
-public final class LocatorLauncher extends AbstractLauncher<String> {
+public class LocatorLauncher extends AbstractLauncher<String> {
 
   /**
    * @deprecated This is specific to the internal implementation and may go away in a future
@@ -1962,7 +1962,7 @@ public final class LocatorLauncher extends AbstractLauncher<String> {
    * 
    * @see org.apache.geode.distributed.AbstractLauncher.ServiceState
    */
-  public static final class LocatorState extends ServiceState<String> {
+  public static class LocatorState extends ServiceState<String> {
 
     /**
      * Unmarshals a LocatorState instance from the JSON String.

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
index 459123f..b2d0151 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
@@ -2603,7 +2603,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
    * 
    * @see org.apache.geode.distributed.AbstractLauncher.ServiceState
    */
-  public static final class ServerState extends ServiceState<String> {
+  public static class ServerState extends ServiceState<String> {
 
     /**
      * Unmarshals a ServerState instance from the JSON String.

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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/a4458531/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..4eb9888 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;
   }
 
@@ -732,7 +732,7 @@ public class DistributionAdvisor {
    * @return the current membership version for this advisor
    * @since GemFire 5.1
    */
-  public final synchronized long startOperation() {
+  public synchronized long startOperation() {
     if (logger.isTraceEnabled(LogMarker.DISTRIBUTION_STATE_FLUSH_OP)) {
       logger.trace(LogMarker.DISTRIBUTION_STATE_FLUSH_OP,
           "startOperation() op count is now {} in view version {}", currentVersionOpCount + 1,
@@ -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,8 +1622,8 @@ 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,
-        boolean removeProfile, boolean exchangeProfiles, final List<Profile> replyProfiles) {
+    protected void handleDistributionAdvisee(DistributionAdvisee advisee, boolean removeProfile,
+        boolean exchangeProfiles, final List<Profile> replyProfiles) {
       final DistributionAdvisor da;
       if (advisee != null && (da = advisee.getDistributionAdvisor()) != null) {
         if (removeProfile) {

http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigSnapshot.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigSnapshot.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigSnapshot.java
index 07e8b02..e878cce 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigSnapshot.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
  * Removed implementations of hashCode() and equals() that were throwing
  * UnsupportedOperationException. See bug #50939 if you need to override those.
  */
-public final class DistributionConfigSnapshot extends DistributionConfigImpl {
+public class DistributionConfigSnapshot extends DistributionConfigImpl {
   private static final long serialVersionUID = 7445728132965092798L;
 
   private HashSet modifiable;