You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by la...@apache.org on 2017/11/07 01:19:59 UTC

[geode] branch feature/GEODE-3930 updated (886da6a -> 779c89a)

This is an automated email from the ASF dual-hosted git repository.

ladyvader pushed a change to branch feature/GEODE-3930
in repository https://gitbox.apache.org/repos/asf/geode.git.


    omit 886da6a  GEODE-3930: Create lucene index on an existing region
     add 50eb158  Geode 3539: Add missing test coverage for 'version' command. (#1009)
     add 76cda80  Feature/geode 3795 (#1012)
     add a1b9725  GEODE-3539: Add missing test coverage for 'describe connection' command.
     add 96684f3  GEODE-3952: Improve and apply spotless.
     add 70b4327  Revert "GEODE-3539: Add missing test coverage for 'describe connection' command."
     add 01dc11f  GEODE-3953: Incorrect use of .equals() for comparison of fieldname arrays GEODE-3954: Misleading Exception message with mismatched fieldAnalyzers
     new 779c89a  GEODE-3930: Create lucene index on an existing region

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (886da6a)
            \
             N -- N -- N   refs/heads/feature/GEODE-3930 (779c89a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.gradle                                       |  46 +-
 .../internal/common/AbstractSessionCache.java      |   7 +-
 .../internal/common/ClientServerSessionCache.java  |  15 +-
 .../internal/common/PeerToPeerSessionCache.java    |  13 +-
 .../session/internal/common/SessionCache.java      |   4 +-
 .../common/SessionExpirationCacheListener.java     |  11 +-
 .../internal/filter/DummySessionManager.java       |   4 +-
 .../internal/filter/GemfireHttpSession.java        |  22 +-
 .../internal/filter/GemfireSessionManager.java     |  28 +-
 .../attributes/AbstractDeltaSessionAttributes.java |   8 +-
 .../attributes/AbstractSessionAttributes.java      |  12 +-
 .../internal/filter/attributes/DeltaEvent.java     |  13 +-
 .../attributes/DeltaQueuedSessionAttributes.java   |   5 +-
 .../filter/attributes/DeltaSessionAttributes.java  |   5 +-
 .../filter/attributes/SessionAttributes.java       |   4 +-
 .../session/internal/filter/util/TypeAwareMap.java |   4 +-
 .../modules/session/filter/SessionListener.java    |   7 +-
 .../session/installer/InstallerJUnitTest.java      |  11 +-
 .../session/internal/filter/BasicServlet.java      |   1 +
 .../modules/session/internal/filter/Callback.java  |   3 +-
 .../session/internal/filter/CallbackServlet.java   |   1 +
 .../filter/HttpSessionBindingListenerImpl.java     |   1 +
 .../SessionReplicationIntegrationJUnitTest.java    |  46 +-
 .../filter/SessionReplicationJUnitTest.java        |   7 +-
 .../SessionReplicationLocalCacheJUnitTest.java     |   7 +-
 .../session/junit/PerTestClassLoaderRunner.java    |  18 +-
 .../catalina/Tomcat7DeltaSessionManager.java       |   4 +-
 .../modules/session/Tomcat7SessionsJUnitTest.java  |   6 +-
 .../modules/session/TestSessionsTomcat8Base.java   |   1 +
 .../modules/session/Tomcat8SessionsDUnitTest.java  |  10 +-
 .../gatewaydelta/AbstractGatewayDeltaEvent.java    |   8 +-
 .../gatewaydelta/GatewayDeltaCreateEvent.java      |   9 +-
 .../gatewaydelta/GatewayDeltaDestroyEvent.java     |   9 +-
 .../GatewayDeltaEventApplicationCacheListener.java |   4 +-
 .../GatewayDeltaForwarderCacheListener.java        |   4 +-
 .../modules/session/bootstrap/AbstractCache.java   |  23 +-
 .../catalina/AbstractCacheLifecycleListener.java   |   5 +-
 .../session/catalina/AbstractSessionCache.java     |   7 +-
 .../session/catalina/ClientServerSessionCache.java |  11 +-
 .../session/catalina/CommitSessionValve.java       |   7 +-
 .../modules/session/catalina/DeltaSession.java     |   2 +-
 .../session/catalina/DeltaSessionFacade.java       |   4 +-
 .../session/catalina/DeltaSessionInterface.java    |   3 +-
 .../session/catalina/DeltaSessionManager.java      |  49 +-
 .../session/catalina/JvmRouteBinderValve.java      |   7 +-
 .../session/catalina/PeerToPeerSessionCache.java   |   7 +-
 .../modules/session/catalina/SessionCache.java     |  10 +-
 .../catalina/callback/LocalSessionCacheLoader.java |   7 +-
 .../catalina/callback/LocalSessionCacheWriter.java |   7 +-
 .../callback/SessionExpirationCacheListener.java   |  11 +-
 .../internal/DeltaSessionAttributeEventBatch.java  |  13 +-
 .../DeltaSessionDestroyAttributeEvent.java         |   9 +-
 .../internal/DeltaSessionUpdateAttributeEvent.java |   9 +-
 .../java/org/apache/geode/modules/util/Banner.java |   4 +-
 .../geode/modules/util/BootstrappingFunction.java  |   6 +-
 .../apache/geode/modules/util/ContextMapper.java   |   4 +-
 .../geode/modules/util/CreateRegionFunction.java   |   1 -
 .../geode/modules/util/DebugCacheListener.java     |   4 +-
 .../geode/modules/util/RegionConfiguration.java    |  11 +-
 .../util/RegionConfigurationCacheListener.java     |   4 +-
 .../apache/geode/modules/util/RegionHelper.java    |  12 +-
 .../geode/modules/util/RegionSizeFunction.java     |   4 +-
 .../modules/util/ResourceManagerValidator.java     |   6 +-
 .../geode/modules/util/SessionCustomExpiry.java    |   9 +-
 .../TouchPartitionedRegionEntriesFunction.java     |   7 +-
 .../util/TouchReplicatedRegionEntriesFunction.java |   7 +-
 .../org/apache/geode/modules/session/Callback.java |   3 +-
 .../geode/modules/session/CommandServlet.java      |   5 +-
 .../geode/modules/session/EmbeddedTomcat.java      |  12 +-
 .../geode/modules/session/TestSessionsBase.java    |   1 +
 .../modules/session/Tomcat6SessionsJUnitTest.java  |   5 +-
 .../util/ClassLoaderObjectInputStreamTest.java     |  25 +-
 .../geode/modules/session/CommandServlet.java      |   1 +
 .../modules/session/SessionCountingListener.java   |   1 +
 .../modules/session/functions/GetSessionCount.java |   5 +-
 .../session/functions/GetSessionCreatedCount.java  |   5 +-
 .../functions/GetSessionDestroyedCount.java        |   5 +-
 .../management/internal/AgentUtilJUnitTest.java    |   7 +-
 .../cli/commands/GfshStartLocatorLogTest.java      |   2 +-
 .../LauncherLifecycleCommandsDUnitTest.java        |   6 +-
 .../StartLocatorCommandIntegrationTest.java        |   2 +-
 .../StartServerCommandIntegrationTest.java         |   2 +-
 .../cli/commands/StatusLocatorRealGfshTest.java    |   2 +-
 .../cli/shell/GfshExitCodeStatusCommandsTest.java  |   2 +-
 .../geode/rest/internal/web/GeodeRestClient.java   |  27 +-
 .../internal/web/RestInterfaceIntegrationTest.java |   2 +-
 .../internal/web/RestSecurityIntegrationTest.java  |   2 +-
 .../web/RestSecurityPostProcessorTest.java         |   2 +-
 .../rest/internal/web/RestSecurityWithSSLTest.java |   2 +-
 .../internal/web/RestServersIntegrationTest.java   |   2 +-
 .../web/SwaggerVerificationIntegrationTest.java    |  16 +-
 .../rest/internal/web/controllers/Customer.java    |   7 +-
 .../rest/internal/web/controllers/Gender.java      |   2 +-
 .../internal/web/controllers/GetAllEntries.java    |   3 +-
 .../web/controllers/GetDeliveredOrders.java        |   2 +-
 .../rest/internal/web/controllers/GetRegions.java  |   2 +-
 .../internal/web/controllers/GetValueForKey.java   |   1 -
 .../geode/rest/internal/web/controllers/Item.java  |   2 +-
 .../web/controllers/NoArgumentFunction.java        |  14 +-
 .../geode/rest/internal/web/controllers/Order.java |   2 +-
 .../rest/internal/web/controllers/Person.java      |   6 +-
 .../internal/web/controllers/PutKeyFunction.java   |   1 -
 .../web/controllers/RedactingPostProcessor.java    |   4 +-
 .../RestAPIOnRegionFunctionExecutionDUnitTest.java |   2 +-
 .../internal/web/controllers/RestAPITestBase.java  |  39 +-
 .../controllers/RestAPIsAndInterOpsDUnitTest.java  |  53 +-
 ...RestAPIsOnGroupsFunctionExecutionDUnitTest.java |   1 -
 ...estAPIsOnMembersFunctionExecutionDUnitTest.java |  19 +-
 .../web/controllers/RestAPIsWithSSLDUnitTest.java  |   1 +
 .../internal/web/controllers/RestTestUtils.java    |   7 +-
 .../apache/geode/session/tests/CargoTestBase.java  |   4 +-
 .../org/apache/geode/session/tests/Client.java     |  15 +-
 .../geode/session/tests/ContainerInstall.java      |  16 +-
 .../tests/GenericAppServerClientServerTest.java    |  21 +-
 .../session/tests/TomcatClientServerTest.java      |   2 +-
 .../TomcatSessionBackwardsCompatibilityTest.java   |   2 +-
 .../geode/tools/pulse/PulseConnectivityTest.java   |   2 +-
 .../geode/tools/pulse/PulseDataExportTest.java     |  11 +-
 .../geode/tools/pulse/PulseSecurityTest.java       |  13 +-
 .../tools/pulse/PulseSecurityWithSSLTest.java      |   2 +-
 .../benchmark/RangeQueryWithIndexBenchmark.java    |  15 +-
 .../cache/benchmark/RegionOperationBenchmark.java  |  15 +-
 .../internal/protocol/MessageExecutionContext.java |   4 +-
 .../protocol/operations/OperationHandler.java      |   3 +-
 .../protobuf/v1/serializer/ProtocolSerializer.java |  34 +
 .../protocol/serialization/codec/JSONCodec.java    |   4 +-
 .../registry/SerializationCodecRegistry.java       |   4 +-
 .../protocol/serializer/ProtocolSerializer.java    |  34 -
 .../ConnectionAuthenticatingStateProcessor.java    |   4 +-
 .../ConnectionShiroAuthorizingStateProcessor.java  |   5 +-
 .../protocol/state/ConnectionStateProcessor.java   |   4 +-
 .../org/apache/geode/annotations/Experimental.java |   4 +-
 .../ClassInExperimentalPackage.java                |   2 +-
 .../experimentalpackage/package-info.java          |   2 +-
 .../ClassInNonExperimentalPackage.java             |   2 +-
 .../nonexperimentalpackage/package-info.java       |   2 +-
 .../src/main/java/java/net/InetAddress.java        |   1 -
 .../geode/internal/ra/GFConnectionFactoryImpl.java |   6 +-
 .../apache/geode/internal/ra/GFConnectionImpl.java |   2 +-
 .../geode/internal/ra/spi/JCALocalTransaction.java |   2 +-
 .../ra/spi/JCAManagedConnectionFactory.java        |   2 +-
 .../ra/spi/JCAManagedConnectionMetaData.java       |   2 +-
 .../java/org/apache/geode/CancelCriterion.java     |  20 +-
 .../java/org/apache/geode/CancelException.java     |  10 +-
 .../org/apache/geode/CanonicalInstantiator.java    |   4 +-
 .../main/java/org/apache/geode/CopyException.java  |   1 -
 .../src/main/java/org/apache/geode/CopyHelper.java |  20 +-
 .../main/java/org/apache/geode/DataSerializer.java |  35 +-
 .../src/main/java/org/apache/geode/Delta.java      |  10 +-
 .../apache/geode/DeltaSerializationException.java  |   4 +-
 .../apache/geode/ForcedDisconnectException.java    |   2 +-
 .../org/apache/geode/GemFireCheckedException.java  |   2 +-
 .../java/org/apache/geode/GemFireRethrowable.java  |   4 +-
 .../org/apache/geode/InternalGemFireError.java     |   8 +-
 .../org/apache/geode/InvalidDeltaException.java    |   8 +-
 .../src/main/java/org/apache/geode/LogWriter.java  |  12 +-
 .../apache/geode/OutOfOffHeapMemoryException.java  |   2 +-
 .../org/apache/geode/SerializationException.java   |   8 +-
 .../java/org/apache/geode/StatisticDescriptor.java |   2 -
 .../src/main/java/org/apache/geode/Statistics.java |  25 +-
 .../java/org/apache/geode/StatisticsFactory.java   |  20 +-
 .../main/java/org/apache/geode/StatisticsType.java |   3 -
 .../org/apache/geode/StatisticsTypeFactory.java    |  18 +-
 .../main/java/org/apache/geode/SystemFailure.java  | 110 +--
 .../java/org/apache/geode/ToDataException.java     |   2 +-
 .../java/org/apache/geode/admin/AdminConfig.java   |   6 +-
 .../apache/geode/admin/AdminDistributedSystem.java |  49 +-
 .../geode/admin/AdminDistributedSystemFactory.java |   9 +-
 .../java/org/apache/geode/admin/AlertListener.java |   2 +-
 .../java/org/apache/geode/admin/BackupStatus.java  |   2 +-
 .../geode/admin/CacheDoesNotExistException.java    |   1 -
 .../org/apache/geode/admin/CacheHealthConfig.java  |  12 +-
 .../java/org/apache/geode/admin/CacheServer.java   |   6 +-
 .../apache/geode/admin/ConfigurationParameter.java |   1 -
 .../geode/admin/DistributedSystemConfig.java       |  39 +-
 .../apache/geode/admin/DistributionLocator.java    |   1 -
 .../geode/admin/DistributionLocatorConfig.java     |   4 +-
 .../apache/geode/admin/GemFireMemberStatus.java    |  25 +-
 .../org/apache/geode/admin/MemberHealthConfig.java |   4 +-
 .../geode/admin/OperationCancelledException.java   |   1 -
 .../geode/admin/RegionNotFoundException.java       |   1 -
 .../geode/admin/RegionSubRegionSnapshot.java       |   8 +-
 .../java/org/apache/geode/admin/Statistic.java     |   1 -
 .../org/apache/geode/admin/StatisticResource.java  |   1 -
 .../java/org/apache/geode/admin/SystemMember.java  |   5 +-
 .../geode/admin/SystemMemberBridgeServer.java      |  46 +-
 .../org/apache/geode/admin/SystemMemberCache.java  |   3 +-
 .../geode/admin/SystemMemberCacheListener.java     |  10 +-
 .../geode/admin/SystemMemberCacheServer.java       |  46 +-
 .../org/apache/geode/admin/SystemMemberRegion.java |  24 +-
 .../org/apache/geode/admin/SystemMemberType.java   |   6 +-
 .../apache/geode/admin/SystemMembershipEvent.java  |   2 +-
 .../admin/UnmodifiableConfigurationException.java  |   1 -
 .../admin/internal/AdminDistributedSystemImpl.java |  57 +-
 .../admin/internal/CacheServerConfigImpl.java      |   4 +-
 .../geode/admin/internal/CacheServerImpl.java      |   8 +-
 .../admin/internal/ConfigurationParameterImpl.java |  10 +-
 .../internal/ConfigurationParameterListener.java   |   1 -
 .../internal/DistributedSystemConfigImpl.java      |  32 +-
 .../internal/DistributedSystemHealthEvaluator.java |   6 +-
 .../internal/DistributedSystemHealthMonitor.java   |   2 +-
 .../internal/DistributionLocatorConfigImpl.java    |  10 +-
 .../admin/internal/DistributionLocatorImpl.java    |  12 +-
 .../internal/EnabledManagedEntityController.java   |  15 +-
 .../geode/admin/internal/FinishBackupRequest.java  |   2 +-
 .../geode/admin/internal/FinishBackupResponse.java |   2 +-
 .../geode/admin/internal/FlushToDiskResponse.java  |   2 +-
 .../geode/admin/internal/GemFireHealthImpl.java    |  16 +-
 .../geode/admin/internal/InetAddressUtil.java      |   5 +-
 .../apache/geode/admin/internal/LogCollator.java   |  11 +-
 .../admin/internal/ManagedEntityConfigImpl.java    |  10 +-
 .../admin/internal/ManagedEntityConfigXml.java     |   7 +-
 .../internal/ManagedEntityConfigXmlGenerator.java  |  14 +-
 .../internal/ManagedEntityConfigXmlParser.java     |  12 +-
 .../admin/internal/ManagedEntityController.java    |   2 +-
 .../internal/ManagedEntityControllerFactory.java   |   2 +-
 .../admin/internal/ManagedSystemMemberImpl.java    |   4 +-
 .../geode/admin/internal/PrepareBackupRequest.java |   4 +-
 .../admin/internal/PrepareBackupResponse.java      |   2 +-
 .../apache/geode/admin/internal/StatisticImpl.java |   3 +-
 .../admin/internal/StatisticResourceImpl.java      |  13 +-
 .../admin/internal/SystemMemberCacheEventImpl.java |   2 +-
 .../internal/SystemMemberCacheEventProcessor.java  |   2 +-
 .../admin/internal/SystemMemberCacheImpl.java      |   7 +-
 .../geode/admin/internal/SystemMemberImpl.java     |  18 +-
 .../internal/SystemMemberRegionEventImpl.java      |   2 +-
 .../admin/internal/SystemMemberRegionImpl.java     |  15 +-
 .../java/org/apache/geode/admin/jmx/Agent.java     |  11 +-
 .../org/apache/geode/admin/jmx/AgentConfig.java    |  31 +-
 .../org/apache/geode/admin/jmx/AgentFactory.java   |   1 -
 .../internal/AdminDistributedSystemJmxImpl.java    |  89 +-
 .../geode/admin/jmx/internal/AgentConfigImpl.java  |  41 +-
 .../apache/geode/admin/jmx/internal/AgentImpl.java |   5 +-
 .../geode/admin/jmx/internal/AgentLauncher.java    |  18 +-
 .../admin/jmx/internal/CacheServerJmxImpl.java     |  24 +-
 .../admin/jmx/internal/ConfigAttributeInfo.java    |   6 +-
 .../internal/ConfigurationParameterJmxImpl.java    |   1 -
 .../DistributedSystemHealthConfigJmxImpl.java      |   7 +-
 .../jmx/internal/DistributionLocatorJmxImpl.java   |  26 +-
 .../admin/jmx/internal/DynamicManagedBean.java     |   7 +-
 .../admin/jmx/internal/GemFireHealthJmxImpl.java   |   1 -
 .../admin/jmx/internal/GenerateMBeanHTML.java      |   1 -
 .../apache/geode/admin/jmx/internal/MBeanUtil.java |  13 +-
 .../jmx/internal/MX4JServerSocketFactory.java      |  19 +-
 .../geode/admin/jmx/internal/MailManager.java      |  26 +-
 .../geode/admin/jmx/internal/ManagedResource.java  |   1 -
 .../admin/jmx/internal/ManagedResourceType.java    |   1 -
 .../jmx/internal/MemberInfoWithStatsMBean.java     | 100 +--
 .../admin/jmx/internal/RMIRegistryService.java     |  33 +-
 .../jmx/internal/RMIRegistryServiceMBean.java      |  14 +-
 .../jmx/internal/RefreshNotificationType.java      |   1 -
 .../admin/jmx/internal/StatAlertNotification.java  |  14 +-
 .../admin/jmx/internal/StatAlertsAggregator.java   |  20 +-
 .../admin/jmx/internal/StatisticAttributeInfo.java |   7 +-
 .../jmx/internal/StatisticResourceJmxImpl.java     |   9 +-
 .../internal/SystemMemberBridgeServerJmxImpl.java  |  10 +-
 .../jmx/internal/SystemMemberCacheJmxImpl.java     |  13 +-
 .../geode/admin/jmx/internal/SystemMemberJmx.java  |  34 +-
 .../admin/jmx/internal/SystemMemberJmxImpl.java    |  29 +-
 .../jmx/internal/SystemMemberRegionJmxImpl.java    |  11 +-
 .../org/apache/geode/cache/AttributesFactory.java  |  70 +-
 .../org/apache/geode/cache/AttributesMutator.java  |  30 +-
 .../main/java/org/apache/geode/cache/Cache.java    |  54 +-
 .../java/org/apache/geode/cache/CacheEvent.java    |  12 +-
 .../apache/geode/cache/CacheExistsException.java   |   4 +-
 .../java/org/apache/geode/cache/CacheFactory.java  |  50 +-
 .../java/org/apache/geode/cache/CacheListener.java |  30 +-
 .../apache/geode/cache/CacheLoaderException.java   |   6 +-
 .../apache/geode/cache/CacheRuntimeException.java  |   6 +-
 .../org/apache/geode/cache/CacheStatistics.java    |   6 +-
 .../geode/cache/CacheTransactionManager.java       |  72 +-
 .../java/org/apache/geode/cache/CacheWriter.java   |   6 +-
 .../apache/geode/cache/CacheWriterException.java   |   6 +-
 .../java/org/apache/geode/cache/ClientSession.java |  18 +-
 .../geode/cache/CommitConflictException.java       |   6 +-
 .../geode/cache/CommitDistributionException.java   |   1 -
 .../geode/cache/CommitIncompleteException.java     |   2 +-
 .../java/org/apache/geode/cache/CustomExpiry.java  |   4 +-
 .../java/org/apache/geode/cache/DataPolicy.java    |  32 +-
 .../apache/geode/cache/DiskAccessException.java    |   1 -
 .../java/org/apache/geode/cache/DiskStore.java     |  20 +-
 .../org/apache/geode/cache/DiskStoreFactory.java   |  30 +-
 .../apache/geode/cache/DiskWriteAttributes.java    |  12 +-
 .../geode/cache/DiskWriteAttributesFactory.java    |  28 +-
 .../cache/DuplicatePrimaryPartitionException.java  |   2 +-
 .../apache/geode/cache/DynamicRegionFactory.java   |  34 +-
 .../apache/geode/cache/DynamicRegionListener.java  |   2 +-
 .../geode/cache/EntryDestroyedException.java       |   8 +-
 .../java/org/apache/geode/cache/EntryEvent.java    |  13 +-
 .../apache/geode/cache/EntryExistsException.java   |   2 +-
 .../apache/geode/cache/EntryNotFoundException.java |   4 +-
 .../org/apache/geode/cache/EntryOperation.java     |  16 +-
 .../org/apache/geode/cache/EvictionAction.java     |   6 +-
 .../org/apache/geode/cache/EvictionAlgorithm.java  |   8 +-
 .../org/apache/geode/cache/EvictionAttributes.java |   6 +-
 .../geode/cache/EvictionAttributesMutator.java     |   4 +-
 .../org/apache/geode/cache/ExpirationAction.java   |  24 +-
 .../apache/geode/cache/ExpirationAttributes.java   |   6 +-
 .../cache/FailedSynchronizationException.java      |   4 +-
 .../geode/cache/FixedPartitionAttributes.java      |  20 +-
 .../apache/geode/cache/FixedPartitionResolver.java |   8 +-
 .../geode/cache/GatewayConfigurationException.java |   2 +-
 .../org/apache/geode/cache/GatewayException.java   |   6 +-
 .../java/org/apache/geode/cache/GemFireCache.java  |  32 +-
 .../org/apache/geode/cache/InterestPolicy.java     |   8 +-
 .../geode/cache/InterestRegistrationEvent.java     |   6 +-
 .../geode/cache/InterestRegistrationListener.java  |   4 +-
 .../apache/geode/cache/InterestResultPolicy.java   |  15 +-
 .../java/org/apache/geode/cache/LoaderHelper.java  |   2 +-
 .../java/org/apache/geode/cache/LossAction.java    |   9 +-
 .../org/apache/geode/cache/LowMemoryException.java |   8 +-
 .../apache/geode/cache/MembershipAttributes.java   |  23 +-
 .../java/org/apache/geode/cache/MirrorType.java    |  12 +-
 .../cache/NoQueueServersAvailableException.java    |  10 +-
 .../NoSubscriptionServersAvailableException.java   |  10 +-
 .../java/org/apache/geode/cache/Operation.java     | 113 +--
 .../geode/cache/OperationAbortedException.java     |   6 +-
 .../apache/geode/cache/PartitionAttributes.java    |  38 +-
 .../geode/cache/PartitionAttributesFactory.java    |  46 +-
 .../org/apache/geode/cache/PartitionResolver.java  |  10 +-
 .../cache/PartitionedRegionStorageException.java   |  26 +-
 .../main/java/org/apache/geode/cache/Region.java   |  94 +-
 .../apache/geode/cache/RegionAccessException.java  |   8 +-
 .../org/apache/geode/cache/RegionAttributes.java   |  58 +-
 .../geode/cache/RegionDestroyedException.java      |   4 +-
 .../geode/cache/RegionDistributionException.java   |   8 +-
 .../apache/geode/cache/RegionExistsException.java  |   8 +-
 .../java/org/apache/geode/cache/RegionFactory.java |  52 +-
 .../geode/cache/RegionMembershipListener.java      |  16 +-
 .../geode/cache/RegionReinitializedException.java  |   4 +-
 .../apache/geode/cache/RegionRoleException.java    |   7 +-
 .../org/apache/geode/cache/RegionRoleListener.java |   5 +-
 .../java/org/apache/geode/cache/RegionService.java |  10 +-
 .../org/apache/geode/cache/RegionShortcut.java     |   2 +-
 .../java/org/apache/geode/cache/RequiredRoles.java |   5 +-
 .../org/apache/geode/cache/ResourceException.java  |   8 +-
 .../org/apache/geode/cache/ResumptionAction.java   |   9 +-
 .../java/org/apache/geode/cache/RoleException.java |   7 +-
 .../main/java/org/apache/geode/cache/Scope.java    |  28 +-
 .../apache/geode/cache/SerializedCacheValue.java   |   4 +-
 .../geode/cache/StatisticsDisabledException.java   |   6 +-
 .../apache/geode/cache/SubscriptionAttributes.java |  11 +-
 .../SynchronizationCommitConflictException.java    |   4 +-
 .../org/apache/geode/cache/TimeoutException.java   |   6 +-
 .../cache/TransactionDataRebalancedException.java  |   2 +-
 .../org/apache/geode/cache/TransactionEvent.java   |   8 +-
 .../apache/geode/cache/TransactionException.java   |   2 +-
 .../java/org/apache/geode/cache/TransactionId.java |   4 +-
 .../geode/cache/TransactionInDoubtException.java   |   2 +-
 .../apache/geode/cache/TransactionListener.java    |   6 +-
 .../org/apache/geode/cache/TransactionWriter.java  |   4 +-
 .../geode/cache/TransactionWriterException.java    |   4 +-
 .../geode/cache/UnsupportedVersionException.java   |   4 +-
 .../apache/geode/cache/asyncqueue/AsyncEvent.java  |   2 +-
 .../geode/cache/asyncqueue/AsyncEventListener.java |  12 +-
 .../geode/cache/asyncqueue/AsyncEventQueue.java    |  32 +-
 .../cache/asyncqueue/AsyncEventQueueFactory.java   |  40 +-
 .../asyncqueue/internal/AsyncEventQueueStats.java  |   2 +-
 .../internal/SerialAsyncEventQueueImpl.java        |   2 +-
 .../cache/client/AllConnectionsInUseException.java |   8 +-
 .../org/apache/geode/cache/client/ClientCache.java |  18 +-
 .../geode/cache/client/ClientCacheFactory.java     |  26 +-
 .../cache/client/ClientNotReadyException.java      |   8 +-
 .../geode/cache/client/ClientRegionFactory.java    |  26 +-
 .../geode/cache/client/ClientRegionShortcut.java   |   2 +-
 .../cache/client/NoAvailableLocatorsException.java |   8 +-
 .../cache/client/NoAvailableServersException.java  |   8 +-
 .../java/org/apache/geode/cache/client/Pool.java   |  58 +-
 .../org/apache/geode/cache/client/PoolFactory.java |  58 +-
 .../org/apache/geode/cache/client/PoolManager.java |  12 +-
 .../cache/client/ServerConnectivityException.java  |  10 +-
 .../cache/client/ServerOperationException.java     |  10 +-
 .../client/ServerRefusedConnectionException.java   |   2 +-
 .../client/SubscriptionNotEnabledException.java    |   8 +-
 .../geode/cache/client/internal/AbstractOp.java    |  22 +-
 .../geode/cache/client/internal/AddPDXEnumOp.java  |   4 +-
 .../geode/cache/client/internal/AddPDXTypeOp.java  |   4 +-
 .../cache/client/internal/AuthenticateUserOp.java  |  24 +-
 .../client/internal/AutoConnectionSourceImpl.java  |   6 +-
 .../client/internal/CacheServerLoadMessage.java    |   2 +-
 .../geode/cache/client/internal/ClearOp.java       |   8 +-
 .../client/internal/ClientMetadataService.java     |  31 +-
 .../client/internal/ClientPartitionAdvisor.java    |  10 +-
 .../client/internal/ClientRegionFactoryImpl.java   |   2 +-
 .../cache/client/internal/CloseConnectionOp.java   |   4 +-
 .../geode/cache/client/internal/CommitOp.java      |   4 +-
 .../geode/cache/client/internal/Connection.java    |   4 +-
 .../cache/client/internal/ConnectionFactory.java   |   8 +-
 .../client/internal/ConnectionFactoryImpl.java     |  11 +-
 .../cache/client/internal/ConnectionImpl.java      |  26 +-
 .../cache/client/internal/ConnectionSource.java    |  10 +-
 .../cache/client/internal/ConnectionStats.java     | 956 ++++++++++-----------
 .../geode/cache/client/internal/ContainsKeyOp.java |   4 +-
 .../geode/cache/client/internal/DestroyOp.java     |   6 +-
 .../cache/client/internal/DestroyRegionOp.java     |   8 +-
 .../geode/cache/client/internal/Endpoint.java      |   2 +-
 .../cache/client/internal/EndpointManager.java     |   6 +-
 .../cache/client/internal/EndpointManagerImpl.java |  14 +-
 .../cache/client/internal/ExecutablePool.java      |  28 +-
 .../client/internal/ExecuteFunctionHelper.java     |   4 +-
 .../client/internal/ExecuteFunctionNoAckOp.java    |   4 +-
 .../cache/client/internal/ExecuteFunctionOp.java   |   4 +-
 .../internal/ExecuteRegionFunctionNoAckOp.java     |   4 +-
 .../client/internal/ExecuteRegionFunctionOp.java   |   4 +-
 .../internal/ExplicitConnectionSourceImpl.java     |  13 +-
 .../geode/cache/client/internal/GetAllOp.java      |   4 +-
 .../client/internal/GetClientPRMetaDataOp.java     |   4 +-
 .../internal/GetClientPartitionAttributesOp.java   |   8 +-
 .../geode/cache/client/internal/GetEntryOp.java    |   2 +-
 .../cache/client/internal/GetEventValueOp.java     |   4 +-
 .../apache/geode/cache/client/internal/GetOp.java  |   4 +-
 .../cache/client/internal/GetPDXEnumByIdOp.java    |   4 +-
 .../geode/cache/client/internal/GetPDXEnumsOp.java |   2 +-
 .../cache/client/internal/GetPDXIdForEnumOp.java   |   4 +-
 .../cache/client/internal/GetPDXIdForTypeOp.java   |   4 +-
 .../cache/client/internal/GetPDXTypeByIdOp.java    |   4 +-
 .../geode/cache/client/internal/GetPDXTypesOp.java |   2 +-
 .../internal/InstantiatorRecoveryListener.java     |   6 +-
 .../geode/cache/client/internal/InternalPool.java  |   4 +-
 .../geode/cache/client/internal/InvalidateOp.java  |   4 +-
 .../geode/cache/client/internal/KeySetOp.java      |  16 +-
 .../client/internal/LocatorDiscoveryCallback.java  |   6 +-
 .../internal/LocatorDiscoveryCallbackAdapter.java  |   2 +-
 .../geode/cache/client/internal/MakePrimaryOp.java |   4 +-
 .../org/apache/geode/cache/client/internal/Op.java |   4 +-
 .../cache/client/internal/OpExecutorImpl.java      |  36 +-
 .../internal/PdxRegistryRecoveryListener.java      |   8 +-
 .../apache/geode/cache/client/internal/PingOp.java |   4 +-
 .../geode/cache/client/internal/PoolImpl.java      |  50 +-
 .../geode/cache/client/internal/PrimaryAckOp.java  |  10 +-
 .../geode/cache/client/internal/ProxyCache.java    |   4 +-
 .../geode/cache/client/internal/ProxyRegion.java   |  12 +-
 .../geode/cache/client/internal/PutAllOp.java      |   6 +-
 .../apache/geode/cache/client/internal/PutOp.java  |  28 +-
 .../geode/cache/client/internal/QueryOp.java       |  27 +-
 .../cache/client/internal/QueueConnectionImpl.java |   4 +-
 .../geode/cache/client/internal/QueueManager.java  |   4 +-
 .../cache/client/internal/QueueManagerImpl.java    |  22 +-
 .../geode/cache/client/internal/QueueState.java    |   1 +
 .../cache/client/internal/QueueStateImpl.java      |  20 +-
 .../cache/client/internal/ReadyForEventsOp.java    |   4 +-
 .../client/internal/RegisterInstantiatorsOp.java   |   6 +-
 .../client/internal/RegisterInterestListOp.java    |   8 +-
 .../cache/client/internal/RegisterInterestOp.java  |  10 +-
 .../client/internal/RegisterInterestTracker.java   |  18 +-
 .../geode/cache/client/internal/RemoveAllOp.java   |   6 +-
 .../geode/cache/client/internal/RollbackOp.java    |   4 +-
 .../cache/client/internal/ServerBlackList.java     |  17 +-
 .../geode/cache/client/internal/ServerProxy.java   |   8 +-
 .../client/internal/ServerRegionDataAccess.java    |  18 +-
 .../cache/client/internal/ServerRegionProxy.java   |  52 +-
 .../client/internal/SingleHopClientExecutor.java   |   4 +-
 .../internal/SingleHopOperationCallable.java       |  11 +-
 .../apache/geode/cache/client/internal/SizeOp.java |   4 +-
 .../geode/cache/client/internal/TXFailoverOp.java  |   2 +-
 .../cache/client/internal/TXSynchronizationOp.java |   6 +-
 .../client/internal/UnregisterInterestListOp.java  |  10 +-
 .../client/internal/UnregisterInterestOp.java      |   6 +-
 .../internal/locator/GetAllServersRequest.java     |   2 +-
 .../internal/locator/GetAllServersResponse.java    |   2 +-
 .../internal/locator/LocatorListResponse.java      |   4 +-
 .../internal/locator/LocatorStatusRequest.java     |   2 +-
 .../internal/locator/LocatorStatusResponse.java    |  16 +-
 .../locator/wan/LocatorMembershipListener.java     |  12 +-
 .../client/internal/pooling/ConnectionManager.java |  16 +-
 .../internal/pooling/ConnectionManagerImpl.java    |  35 +-
 .../client/internal/pooling/PooledConnection.java  |   8 +-
 .../geode/cache/control/RebalanceFactory.java      |   6 +-
 .../geode/cache/control/RebalanceOperation.java    |   2 +-
 .../geode/cache/control/RebalanceResults.java      |  22 +-
 .../geode/cache/control/ResourceManager.java       |  22 +-
 .../execute/EmptyRegionFunctionException.java      |  10 +-
 .../org/apache/geode/cache/execute/Execution.java  |  16 +-
 .../org/apache/geode/cache/execute/Function.java   |  12 +-
 .../geode/cache/execute/FunctionAdapter.java       |   6 +-
 .../geode/cache/execute/FunctionContext.java       |  10 +-
 .../geode/cache/execute/FunctionException.java     |  14 +-
 .../execute/FunctionInvocationTargetException.java |  16 +-
 .../geode/cache/execute/FunctionService.java       |  38 +-
 .../geode/cache/execute/RegionFunctionContext.java |  18 +-
 .../geode/cache/execute/ResultCollector.java       |  28 +-
 .../apache/geode/cache/execute/ResultSender.java   |  26 +-
 .../execute/internal/FunctionServiceManager.java   |  36 +-
 .../cache/operations/CloseCQOperationContext.java  |   6 +-
 .../cache/operations/DestroyOperationContext.java  |   8 +-
 .../operations/ExecuteCQOperationContext.java      |   6 +-
 .../ExecuteFunctionOperationContext.java           |   2 +-
 .../operations/GetDurableCQsOperationContext.java  |   8 +-
 .../cache/operations/GetOperationContext.java      |  10 +-
 .../cache/operations/InterestOperationContext.java |   6 +-
 .../geode/cache/operations/InterestType.java       |   6 +-
 .../operations/InvalidateOperationContext.java     |   8 +-
 .../cache/operations/KeyOperationContext.java      |  14 +-
 .../cache/operations/KeySetOperationContext.java   |  14 +-
 .../cache/operations/KeyValueOperationContext.java |  20 +-
 .../cache/operations/PutAllOperationContext.java   |  16 +-
 .../cache/operations/PutOperationContext.java      |  14 +-
 .../cache/operations/QueryOperationContext.java    |  20 +-
 .../operations/RegionClearOperationContext.java    |   6 +-
 .../operations/RegionCreateOperationContext.java   |   6 +-
 .../operations/RegionDestroyOperationContext.java  |   6 +-
 .../cache/operations/RegionOperationContext.java   |  10 +-
 .../RegisterInterestOperationContext.java          |   8 +-
 .../operations/RemoveAllOperationContext.java      |  10 +-
 .../cache/operations/StopCQOperationContext.java   |   6 +-
 .../UnregisterInterestOperationContext.java        |   6 +-
 .../cache/operations/internal/UpdateOnlyMap.java   |   5 +-
 .../geode/cache/partition/PartitionListener.java   |  26 +-
 .../cache/partition/PartitionListenerAdapter.java  |   6 +-
 .../geode/cache/partition/PartitionMemberInfo.java |  12 +-
 .../partition/PartitionNotAvailableException.java  |   2 +-
 .../cache/partition/PartitionRebalanceInfo.java    |  32 +-
 .../cache/partition/PartitionRegionHelper.java     |  40 +-
 .../geode/cache/partition/PartitionRegionInfo.java |  18 +-
 .../ConflictingPersistentDataException.java        |   4 +-
 .../persistence/PartitionOfflineException.java     |   8 +-
 .../geode/cache/persistence/PersistentID.java      |   6 +-
 .../PersistentReplicatesOfflineException.java      |   4 +-
 .../cache/persistence/RevokeFailedException.java   |   2 +-
 .../RevokedPersistentDataException.java            |   4 +-
 .../org/apache/geode/cache/query/Aggregator.java   |   6 +-
 .../geode/cache/query/AmbiguousNameException.java  |   4 +-
 .../org/apache/geode/cache/query/CqAttributes.java |   6 +-
 .../geode/cache/query/CqAttributesFactory.java     |   6 +-
 .../geode/cache/query/CqAttributesMutator.java     |   8 +-
 .../geode/cache/query/CqClosedException.java       |   8 +-
 .../java/org/apache/geode/cache/query/CqEvent.java |  17 +-
 .../org/apache/geode/cache/query/CqException.java  |   8 +-
 .../geode/cache/query/CqExistsException.java       |   8 +-
 .../org/apache/geode/cache/query/CqListener.java   |   2 +-
 .../java/org/apache/geode/cache/query/CqQuery.java |  30 +-
 .../org/apache/geode/cache/query/CqResults.java    |  16 +-
 .../geode/cache/query/CqServiceStatistics.java     |  12 +-
 .../java/org/apache/geode/cache/query/CqState.java |   2 +-
 .../org/apache/geode/cache/query/CqStatistics.java |  10 +-
 .../apache/geode/cache/query/CqStatusListener.java |   2 +-
 .../geode/cache/query/FunctionDomainException.java |   2 +-
 .../java/org/apache/geode/cache/query/Index.java   |  13 +-
 .../geode/cache/query/IndexCreationException.java  |   6 +-
 .../geode/cache/query/IndexExistsException.java    |   4 +-
 .../geode/cache/query/IndexInvalidException.java   |   6 +-
 .../cache/query/IndexMaintenanceException.java     |   6 +-
 .../cache/query/IndexNameConflictException.java    |   4 +-
 .../apache/geode/cache/query/IndexStatistics.java  |   1 -
 .../org/apache/geode/cache/query/IndexType.java    |   2 +-
 .../cache/query/MultiIndexCreationException.java   |  10 +-
 .../geode/cache/query/NameNotFoundException.java   |   4 +-
 .../geode/cache/query/NameResolutionException.java |   4 +-
 .../query/ParameterCountInvalidException.java      |   2 +-
 .../java/org/apache/geode/cache/query/Query.java   |  28 +-
 .../apache/geode/cache/query/QueryException.java   |   8 +-
 .../query/QueryExecutionLowMemoryException.java    |  10 +-
 .../query/QueryExecutionTimeoutException.java      |   6 +-
 .../geode/cache/query/QueryInvalidException.java   |   4 +-
 .../query/QueryInvocationTargetException.java      |   6 +-
 .../org/apache/geode/cache/query/QueryService.java | 131 +--
 .../geode/cache/query/RegionNotFoundException.java |   4 +-
 .../apache/geode/cache/query/SelectResults.java    |  13 +-
 .../java/org/apache/geode/cache/query/Struct.java  |   3 +-
 .../geode/cache/query/TypeMismatchException.java   |   4 +-
 .../query/internal/AbstractCompiledValue.java      |   8 +-
 .../internal/AbstractGroupOrRangeJunction.java     |  14 +-
 .../cache/query/internal/AllGroupJunction.java     |   7 +-
 .../cache/query/internal/AttributeDescriptor.java  |   3 +-
 .../org/apache/geode/cache/query/internal/Bag.java |  10 +-
 .../query/internal/CompiledAggregateFunction.java  |   6 +-
 .../cache/query/internal/CompiledBindArgument.java |   6 +-
 .../cache/query/internal/CompiledComparison.java   |  20 +-
 .../cache/query/internal/CompiledConstruction.java |   1 +
 .../cache/query/internal/CompiledFunction.java     |   2 +-
 .../query/internal/CompiledGroupBySelect.java      |   2 +-
 .../geode/cache/query/internal/CompiledID.java     |   3 +-
 .../geode/cache/query/internal/CompiledIn.java     |   8 +-
 .../query/internal/CompiledIndexOperation.java     |   7 +-
 .../cache/query/internal/CompiledIteratorDef.java  |   2 +-
 .../cache/query/internal/CompiledJunction.java     |  36 +-
 .../geode/cache/query/internal/CompiledLike.java   |   6 +-
 .../cache/query/internal/CompiledLiteral.java      |   2 -
 .../cache/query/internal/CompiledOperation.java    |   2 +-
 .../geode/cache/query/internal/CompiledPath.java   |   2 +-
 .../geode/cache/query/internal/CompiledRegion.java |   3 +-
 .../geode/cache/query/internal/CompiledSelect.java |  24 +-
 .../cache/query/internal/CompiledUnaryMinus.java   |  11 +-
 .../cache/query/internal/CompiledUndefined.java    |   6 +-
 .../geode/cache/query/internal/CompiledValue.java  |   6 +-
 .../query/internal/CompositeGroupJunction.java     |  25 +-
 .../apache/geode/cache/query/internal/CqEntry.java |   8 +-
 .../cache/query/internal/CqQueryVsdStats.java      |  24 +-
 .../geode/cache/query/internal/CqStateImpl.java    |   2 +-
 .../internal/CumulativeNonDistinctResults.java     |   4 +-
 .../geode/cache/query/internal/DefaultQuery.java   |   4 +-
 .../cache/query/internal/DefaultQueryService.java  |  45 +-
 .../geode/cache/query/internal/DerivedInfo.java    |   4 +-
 .../cache/query/internal/ExecutionContext.java     |  14 +-
 .../apache/geode/cache/query/internal/Filter.java  |  21 +-
 .../geode/cache/query/internal/Functions.java      |   3 +-
 .../geode/cache/query/internal/GroupJunction.java  |   7 +-
 .../cache/query/internal/HashingStrategy.java      |   6 +-
 .../geode/cache/query/internal/IndexInfo.java      |   2 +-
 .../query/internal/IndexTrackingQueryObserver.java |   6 +-
 .../geode/cache/query/internal/Indexable.java      |   8 +-
 .../cache/query/internal/LinkedStructSet.java      |  11 +-
 .../cache/query/internal/NWayMergeResults.java     |  28 +-
 .../geode/cache/query/internal/Negatable.java      |   1 -
 .../geode/cache/query/internal/NullToken.java      |   2 +-
 .../cache/query/internal/ObjectIntHashMap.java     |  28 +-
 .../cache/query/internal/OrderByComparator.java    |   4 +-
 .../apache/geode/cache/query/internal/Ordered.java |   2 +-
 .../cache/query/internal/OrganizedOperands.java    |   8 +-
 .../geode/cache/query/internal/PathUtils.java      |   2 +-
 .../geode/cache/query/internal/PlanInfo.java       |   4 +-
 .../cache/query/internal/ProxyQueryService.java    |   2 +-
 .../geode/cache/query/internal/QCompiler.java      |  16 +-
 .../apache/geode/cache/query/internal/QRegion.java |   7 +-
 .../apache/geode/cache/query/internal/QScope.java  |   8 +-
 .../internal/QueryExecutionCanceledException.java  |   8 +-
 .../geode/cache/query/internal/QueryExecutor.java  |   2 +-
 .../geode/cache/query/internal/QueryMonitor.java   |  14 +-
 .../geode/cache/query/internal/QueryObserver.java  |  61 +-
 .../cache/query/internal/QueryObserverAdapter.java |  56 +-
 .../cache/query/internal/QueryObserverHolder.java  |  12 +-
 .../geode/cache/query/internal/QueryUtils.java     |  32 +-
 .../geode/cache/query/internal/RangeJunction.java  |  52 +-
 .../ResultsCollectionCopyOnReadWrapper.java        |   4 +-
 .../query/internal/ResultsCollectionWrapper.java   |  19 +-
 .../geode/cache/query/internal/ResultsSet.java     |   8 +-
 .../cache/query/internal/RuntimeIterator.java      |   6 +-
 .../query/internal/SelectResultsComparator.java    |   2 +-
 .../cache/query/internal/SortedResultSet.java      |   9 +-
 .../cache/query/internal/SortedResultsBag.java     |  16 +-
 .../cache/query/internal/SortedStructBag.java      |  12 +-
 .../cache/query/internal/SortedStructSet.java      |  19 +-
 .../geode/cache/query/internal/StructBag.java      |  14 +-
 .../geode/cache/query/internal/StructFields.java   |   4 +-
 .../geode/cache/query/internal/StructImpl.java     |   2 +-
 .../geode/cache/query/internal/StructSet.java      |  24 +-
 .../apache/geode/cache/query/internal/Support.java |   2 +-
 .../geode/cache/query/internal/Undefined.java      |   5 +-
 .../internal/aggregate/AbstractAggregator.java     |   2 +-
 .../geode/cache/query/internal/aggregate/Avg.java  |   2 +-
 .../query/internal/aggregate/AvgBucketNode.java    |   2 +-
 .../query/internal/aggregate/AvgDistinct.java      |   2 +-
 .../internal/aggregate/AvgDistinctPRQueryNode.java |   2 +-
 .../query/internal/aggregate/AvgPRQueryNode.java   |   2 +-
 .../cache/query/internal/aggregate/Count.java      |   2 +-
 .../query/internal/aggregate/CountDistinct.java    |   4 +-
 .../aggregate/CountDistinctPRQueryNode.java        |   2 +-
 .../query/internal/aggregate/CountPRQueryNode.java |   2 +-
 .../internal/aggregate/DistinctAggregator.java     |   2 +-
 .../cache/query/internal/aggregate/MaxMin.java     |   2 +-
 .../geode/cache/query/internal/aggregate/Sum.java  |   2 +-
 .../internal/aggregate/SumDistinctPRQueryNode.java |   2 +-
 .../geode/cache/query/internal/cq/ClientCQ.java    |   2 +-
 .../cache/query/internal/cq/CqAttributesImpl.java  |  14 +-
 .../geode/cache/query/internal/cq/CqService.java   |  26 +-
 .../cache/query/internal/cq/CqServiceProvider.java |   8 +-
 .../cache/query/internal/cq/InternalCqQuery.java   |   4 +-
 .../geode/cache/query/internal/cq/ServerCQ.java    |   8 +-
 .../cache/query/internal/index/AbstractIndex.java  |  22 +-
 .../query/internal/index/CompactRangeIndex.java    |  32 +-
 .../cache/query/internal/index/HashIndex.java      |   2 +-
 .../cache/query/internal/index/HashIndexSet.java   |  52 +-
 .../cache/query/internal/index/IMQException.java   |   6 +-
 .../internal/index/IndexConcurrentHashSet.java     |   8 +-
 .../query/internal/index/IndexCreationData.java    |   4 +-
 .../cache/query/internal/index/IndexData.java      |   6 +-
 .../cache/query/internal/index/IndexElemArray.java |  24 +-
 .../cache/query/internal/index/IndexManager.java   |  34 +-
 .../cache/query/internal/index/IndexProtocol.java  |  24 +-
 .../cache/query/internal/index/IndexStats.java     |   2 +-
 .../cache/query/internal/index/IndexStore.java     |  10 +-
 .../internal/index/IndexedExpressionEvaluator.java |   2 +-
 .../cache/query/internal/index/MapRangeIndex.java  |   1 +
 .../query/internal/index/MemoryIndexStore.java     |   7 +-
 .../query/internal/index/PartitionedIndex.java     |  26 +-
 .../cache/query/internal/index/RangeIndex.java     |  16 +-
 .../query/internal/parse/ASTAggregateFunc.java     |   2 +-
 .../geode/cache/query/internal/parse/ASTAnd.java   |   1 +
 .../cache/query/internal/parse/ASTCombination.java |   1 +
 .../cache/query/internal/parse/ASTCompareOp.java   |   1 +
 .../query/internal/parse/ASTConstruction.java      |   1 +
 .../query/internal/parse/ASTConversionExpr.java    |   1 +
 .../cache/query/internal/parse/ASTGroupBy.java     |   4 +-
 .../geode/cache/query/internal/parse/ASTHint.java  |   4 +-
 .../query/internal/parse/ASTHintIdentifier.java    |   4 +-
 .../cache/query/internal/parse/ASTIdentifier.java  |   1 +
 .../cache/query/internal/parse/ASTImport.java      |   1 +
 .../geode/cache/query/internal/parse/ASTIn.java    |   1 +
 .../cache/query/internal/parse/ASTIteratorDef.java |   4 +-
 .../geode/cache/query/internal/parse/ASTLike.java  |   2 +-
 .../geode/cache/query/internal/parse/ASTLimit.java |   1 +
 .../cache/query/internal/parse/ASTLiteral.java     |   6 +-
 .../query/internal/parse/ASTMethodInvocation.java  |   3 +-
 .../geode/cache/query/internal/parse/ASTOr.java    |   1 +
 .../cache/query/internal/parse/ASTOrderBy.java     |   4 +-
 .../cache/query/internal/parse/ASTParameter.java   |   1 +
 .../cache/query/internal/parse/ASTPostfix.java     |   1 +
 .../cache/query/internal/parse/ASTProjection.java  |   1 +
 .../cache/query/internal/parse/ASTRegionPath.java  |   1 +
 .../cache/query/internal/parse/ASTSelect.java      |   2 +-
 .../query/internal/parse/ASTSortCriterion.java     |   1 +
 .../geode/cache/query/internal/parse/ASTTrace.java |   4 +-
 .../geode/cache/query/internal/parse/ASTType.java  |   1 +
 .../cache/query/internal/parse/ASTTypeCast.java    |   1 +
 .../geode/cache/query/internal/parse/ASTUnary.java |   6 +-
 .../query/internal/parse/ASTUndefinedExpr.java     |   1 +
 .../cache/query/internal/parse/ASTUnsupported.java |   1 +
 .../cache/query/internal/parse/GemFireAST.java     |   3 +-
 .../cache/query/internal/parse/UtilParser.java     |   3 +-
 .../query/internal/types/CollectionTypeImpl.java   |   2 +-
 .../internal/types/ExtendedNumericComparator.java  |   2 +-
 .../cache/query/internal/types/MapTypeImpl.java    |   5 +-
 .../query/internal/types/NumericComparator.java    |   2 -
 .../cache/query/internal/types/ObjectTypeImpl.java |   4 +-
 .../cache/query/internal/types/StructTypeImpl.java |   5 +-
 .../query/internal/types/TemporalComparator.java   |   2 -
 .../cache/query/internal/types/TypeUtils.java      |  23 +-
 .../geode/cache/query/types/CollectionType.java    |   4 +-
 .../apache/geode/cache/query/types/MapType.java    |   2 +-
 .../apache/geode/cache/query/types/StructType.java |   4 +-
 .../org/apache/geode/cache/server/CacheServer.java |  74 +-
 .../cache/server/ClientSubscriptionConfig.java     |  28 +-
 .../org/apache/geode/cache/server/ServerLoad.java  |  18 +-
 .../apache/geode/cache/server/ServerLoadProbe.java |   8 +-
 .../geode/cache/server/ServerLoadProbeAdapter.java |   4 +-
 .../apache/geode/cache/server/ServerMetrics.java   |   2 +-
 .../server/internal/ConnectionCountProbe.java      |   8 +-
 .../geode/cache/server/internal/LoadMonitor.java   |   4 +-
 .../cache/server/internal/ServerMetricsImpl.java   |   2 +-
 .../geode/cache/snapshot/CacheSnapshotService.java |  32 +-
 .../cache/snapshot/RegionSnapshotService.java      |  40 +-
 .../geode/cache/snapshot/SnapshotFilter.java       |   9 +-
 .../geode/cache/snapshot/SnapshotIterator.java     |  18 +-
 .../geode/cache/snapshot/SnapshotOptions.java      |  10 +-
 .../geode/cache/snapshot/SnapshotReader.java       |   9 +-
 .../geode/cache/util/CacheListenerAdapter.java     |   6 +-
 .../apache/geode/cache/util/CqListenerAdapter.java |   2 +-
 .../java/org/apache/geode/cache/util/Gateway.java  |   6 +-
 .../geode/cache/util/GatewayConflictHelper.java    |   4 +-
 .../geode/cache/util/GatewayConflictResolver.java  |   4 +-
 .../org/apache/geode/cache/util/GatewayEvent.java  |  24 +-
 .../org/apache/geode/cache/util/ObjectSizer.java   |  20 +-
 .../util/RegionMembershipListenerAdapter.java      |   4 +-
 .../cache/util/RegionRoleListenerAdapter.java      |   3 +-
 .../cache/util/StringPrefixPartitionResolver.java  |   4 +-
 .../geode/cache/util/TimestampedEntryEvent.java    |   2 +-
 .../cache/util/TransactionListenerAdapter.java     |   6 +-
 .../apache/geode/cache/wan/GatewayEventFilter.java |  10 +-
 .../cache/wan/GatewayEventSubstitutionFilter.java  |   2 +-
 .../apache/geode/cache/wan/GatewayQueueEvent.java  |  20 +-
 .../apache/geode/cache/wan/GatewayReceiver.java    |  28 +-
 .../geode/cache/wan/GatewayReceiverFactory.java    |  24 +-
 .../org/apache/geode/cache/wan/GatewaySender.java  |  74 +-
 .../geode/cache/wan/GatewaySenderFactory.java      |  46 +-
 .../geode/compression/CompressionException.java    |   2 +-
 .../org/apache/geode/compression/Compressor.java   |  14 +-
 .../apache/geode/compression/SnappyCompressor.java |   4 +-
 .../apache/geode/distributed/AbstractLauncher.java |   2 +-
 .../geode/distributed/ClientSocketFactory.java     |  10 +-
 .../geode/distributed/ConfigurationProperties.java | 100 +--
 .../geode/distributed/DistributedLockService.java  |  40 +-
 .../geode/distributed/DistributedMember.java       |  10 +-
 .../geode/distributed/DistributedSystem.java       |  92 +-
 .../DistributedSystemDisconnectedException.java    |   2 +-
 .../geode/distributed/DurableClientAttributes.java |   6 +-
 .../distributed/FutureCancelledException.java      |   3 +-
 .../distributed/GatewayCancelledException.java     |   2 +-
 .../java/org/apache/geode/distributed/Locator.java |  46 +-
 .../apache/geode/distributed/LocatorLauncher.java  |   8 +-
 .../geode/distributed/LockNotHeldException.java    |   1 -
 .../distributed/LockServiceDestroyedException.java |   1 -
 .../geode/distributed/OplogCancelledException.java |   2 +-
 .../geode/distributed/PoolCancelledException.java  |   2 +-
 .../java/org/apache/geode/distributed/Role.java    |   1 -
 .../distributed/ServerLauncherCacheProvider.java   |   4 +-
 .../distributed/TXManagerCancelledException.java   |   2 +-
 .../internal/AbstractDistributionConfig.java       |   8 +-
 .../internal/AtomicLongWithTerminalState.java      |   4 +-
 .../geode/distributed/internal/CacheTime.java      |   2 +-
 .../internal/ClusterConfigurationService.java      |  14 +-
 .../internal/CollectingReplyProcessor.java         |   8 +-
 .../geode/distributed/internal/ConflationKey.java  |   3 +-
 .../org/apache/geode/distributed/internal/DM.java  |  48 +-
 .../apache/geode/distributed/internal/DMStats.java |  16 +-
 .../apache/geode/distributed/internal/DSClock.java |  19 +-
 .../distributed/internal/DirectReplyProcessor.java |  12 +-
 .../distributed/internal/DistributionAdvisee.java  |  20 +-
 .../distributed/internal/DistributionAdvisor.java  | 125 +--
 .../distributed/internal/DistributionChannel.java  |   2 +-
 .../distributed/internal/DistributionConfig.java   | 462 +++++-----
 .../internal/DistributionConfigImpl.java           |  22 +-
 .../internal/DistributionConfigSnapshot.java       |   2 +-
 .../distributed/internal/DistributionManager.java  | 171 ++--
 .../distributed/internal/DistributionMessage.java  |  16 +-
 .../internal/DistributionMessageObserver.java      |  10 +-
 .../distributed/internal/DistributionStats.java    | 331 ++++---
 .../distributed/internal/FlowControlParams.java    |   4 +-
 .../internal/FunctionExecutionPooledExecutor.java  |  10 +-
 .../geode/distributed/internal/HealthMonitor.java  |   2 +-
 .../distributed/internal/HealthMonitorImpl.java    |   2 +-
 .../internal/HighPriorityAckedMessage.java         |   6 +-
 .../internal/InternalDistributedSystem.java        | 113 +--
 .../distributed/internal/InternalLocator.java      |  28 +-
 .../distributed/internal/LocatorLoadSnapshot.java  |  14 +-
 .../geode/distributed/internal/LocatorStats.java   |  16 +-
 .../internal/LonerDistributionManager.java         |  32 +-
 .../distributed/internal/MembershipListener.java   |   4 +-
 .../internal/OverflowQueueWithDMStats.java         |   2 +-
 .../internal/PooledDistributionMessage.java        |   1 -
 .../internal/PooledExecutorWithDMStats.java        |   6 +-
 .../distributed/internal/ProcessorKeeper21.java    |  13 +-
 .../geode/distributed/internal/ProductUseLog.java  |   2 +-
 .../distributed/internal/ProfileListener.java      |   8 +-
 .../internal/ReliableReplyException.java           |   2 +-
 .../internal/ReliableReplyProcessor21.java         |   4 +-
 .../geode/distributed/internal/ReplyException.java |  16 +-
 .../geode/distributed/internal/ReplyMessage.java   |   2 +-
 .../distributed/internal/ReplyProcessor21.java     |  57 +-
 .../geode/distributed/internal/ReplySender.java    |   2 +-
 .../geode/distributed/internal/ResourceEvent.java  |   1 -
 .../internal/ResourceEventsListener.java           |   6 +-
 .../internal/RuntimeDistributionConfigImpl.java    |  12 +-
 .../distributed/internal/SerialAckedMessage.java   |   6 +-
 .../internal/SerialDistributionMessage.java        |   1 -
 .../geode/distributed/internal/ServerLocation.java |   2 +-
 .../geode/distributed/internal/ServerLocator.java  |   8 +-
 .../distributed/internal/ShutdownMessage.java      |   8 +-
 .../geode/distributed/internal/Sizeable.java       |   2 +-
 .../distributed/internal/SizeableRunnable.java     |   4 +-
 .../geode/distributed/internal/StartupMessage.java |  30 +-
 .../distributed/internal/StartupMessageData.java   |   4 +-
 .../internal/StartupMessageReplyProcessor.java     |   1 +
 .../distributed/internal/StartupOperation.java     |   2 +-
 .../internal/StartupResponseMessage.java           |   1 -
 .../internal/ThrottledMemQueueStatHelper.java      |   6 +-
 .../internal/ThrottledQueueStatHelper.java         |   2 +-
 .../ThrottlingMemLinkedQueueWithDMStats.java       |   3 +-
 .../internal/WaitForViewInstallation.java          |   6 +-
 .../internal/deadlock/DLockDependencyMonitor.java  |   2 +-
 .../internal/deadlock/DeadlockDetector.java        |  20 +-
 .../distributed/internal/deadlock/Dependency.java  |   7 +-
 .../internal/deadlock/DependencyGraph.java         |  16 +-
 .../internal/deadlock/DependencyMonitor.java       |   2 +-
 .../deadlock/DependencyMonitorManager.java         |   8 +-
 .../internal/deadlock/GemFireDeadlockDetector.java |   6 +-
 .../internal/deadlock/LocalLockInfo.java           |   2 +-
 .../distributed/internal/deadlock/LocalThread.java |   2 +-
 .../deadlock/MessageDependencyMonitor.java         |   4 +-
 .../internal/deadlock/UnsafeThreadLocal.java       |   8 +-
 .../distributed/internal/direct/DirectChannel.java |  45 +-
 .../internal/direct/DirectChannelListener.java     |   4 +-
 .../internal/direct/ShunnedMemberException.java    |   2 +-
 .../distributed/internal/locks/DLockBatch.java     |   4 +-
 .../distributed/internal/locks/DLockBatchId.java   |   1 -
 .../distributed/internal/locks/DLockGrantor.java   | 244 +++---
 .../locks/DLockLessorDepartureHandler.java         |   1 -
 .../internal/locks/DLockQueryProcessor.java        |  18 +-
 .../locks/DLockRecoverGrantorProcessor.java        |   5 +-
 .../internal/locks/DLockReleaseProcessor.java      |   1 -
 .../internal/locks/DLockRemoteToken.java           |  30 +-
 .../distributed/internal/locks/DLockService.java   | 104 +--
 .../distributed/internal/locks/DLockStats.java     | 143 ++-
 .../distributed/internal/locks/DLockToken.java     |  46 +-
 .../internal/locks/DeposeGrantorProcessor.java     |   3 +-
 .../internal/locks/DistributedLockStats.java       |   1 -
 .../internal/locks/DistributedMemberLock.java      |  21 +-
 .../internal/locks/DummyDLockStats.java            |   1 -
 .../internal/locks/ElderInitProcessor.java         |   1 -
 .../distributed/internal/locks/ElderState.java     |   8 +-
 .../internal/locks/GrantorRequestProcessor.java    |  23 +-
 .../locks/LockGrantorDestroyedException.java       |   1 -
 .../distributed/internal/locks/LockGrantorId.java  |  26 +-
 .../locks/NonGrantorDestroyedProcessor.java        |   6 +-
 .../distributed/internal/locks/RemoteThread.java   |   3 +-
 .../membership/DistributedMembershipListener.java  |  14 +-
 .../membership/InternalDistributedMember.java      |  40 +-
 .../internal/membership/InternalRole.java          |  16 +-
 .../internal/membership/MemberAttributes.java      |   1 -
 .../internal/membership/MemberFactory.java         |  16 +-
 .../internal/membership/MemberServices.java        |  20 +-
 .../internal/membership/MembershipManager.java     |  44 +-
 .../internal/membership/MembershipTestHook.java    |   4 +-
 .../distributed/internal/membership/NetMember.java |   8 +-
 .../distributed/internal/membership/NetView.java   |  25 +-
 .../internal/membership/QuorumChecker.java         |   4 +-
 .../internal/membership/gms/GMSMember.java         |  39 +-
 .../internal/membership/gms/GMSMemberFactory.java  |   8 +-
 .../internal/membership/gms/GMSUtil.java           |   4 +-
 .../internal/membership/gms/NetLocator.java        |   2 +-
 .../internal/membership/gms/ServiceConfig.java     |   6 +-
 .../internal/membership/gms/Services.java          |   7 +-
 .../membership/gms/fd/GMSHealthMonitor.java        |  67 +-
 .../membership/gms/interfaces/HealthMonitor.java   |   6 +-
 .../membership/gms/interfaces/Manager.java         |  12 +-
 .../membership/gms/interfaces/Messenger.java       |  16 +-
 .../membership/gms/locator/GMSLocator.java         |  13 +-
 .../membership/gms/membership/GMSJoinLeave.java    |  49 +-
 .../membership/gms/membership/HostAddress.java     |   2 +-
 .../membership/gms/messenger/AddressManager.java   |   4 +-
 .../membership/gms/messenger/GMSEncrypt.java       |   7 +-
 .../membership/gms/messenger/JGAddress.java        |  19 +-
 .../membership/gms/messenger/JGroupsMessenger.java |  87 +-
 .../membership/gms/messenger/StatRecorder.java     |   8 +-
 .../membership/gms/messenger/Transport.java        |   6 +-
 .../membership/gms/mgr/GMSMembershipManager.java   |  16 +-
 .../membership/gms/mgr/LocalViewMessage.java       |   2 +-
 .../internal/streaming/StreamingOperation.java     |   8 +-
 .../internal/tcpserver/InfoRequest.java            |   2 +-
 .../internal/tcpserver/InfoResponse.java           |   2 +-
 .../internal/tcpserver/ShutdownRequest.java        |   2 +-
 .../internal/tcpserver/ShutdownResponse.java       |   2 +-
 .../distributed/internal/tcpserver/TcpClient.java  |  10 +-
 .../distributed/internal/tcpserver/TcpHandler.java |   6 +-
 .../distributed/internal/tcpserver/TcpServer.java  |  16 +-
 .../internal/tcpserver/VersionRequest.java         |   4 +-
 .../internal/tcpserver/VersionResponse.java        |   8 +-
 .../unsafe/RegisterSignalHandlerSupport.java       |   2 +-
 .../examples/security/ExamplePostProcessor.java    |   4 +-
 .../examples/security/ExampleSecurityManager.java  |   2 +-
 .../java/org/apache/geode/i18n/LogWriterI18n.java  |  72 +-
 .../main/java/org/apache/geode/i18n/StringId.java  |  16 +-
 .../org/apache/geode/internal/AbstractConfig.java  |   6 +-
 .../java/org/apache/geode/internal/Assert.java     |   6 +-
 .../org/apache/geode/internal/AvailablePort.java   |   4 +-
 .../java/org/apache/geode/internal/Banner.java     |  12 +-
 .../apache/geode/internal/ByteArrayDataInput.java  |   4 +-
 .../geode/internal/ByteBufferOutputStream.java     |   4 +-
 .../org/apache/geode/internal/ClassPathLoader.java |  21 +-
 .../java/org/apache/geode/internal/Config.java     |  22 +-
 .../org/apache/geode/internal/ConfigSource.java    |   2 +-
 .../apache/geode/internal/ConnectionWatcher.java   |   2 +-
 .../apache/geode/internal/CopyOnWriteHashSet.java  |   6 +-
 .../java/org/apache/geode/internal/DSCODE.java     |  56 +-
 .../org/apache/geode/internal/DSFIDFactory.java    |   2 +-
 .../geode/internal/DSFIDNotFoundException.java     |   2 +-
 .../geode/internal/DataSerializableFixedID.java    |  14 +-
 .../org/apache/geode/internal/GemFireVersion.java  | 219 +----
 .../geode/internal/GfeConsoleReaderFactory.java    |  10 +-
 .../geode/internal/HeapDataOutputStream.java       |  47 +-
 .../org/apache/geode/internal/HistogramStats.java  |   4 +-
 .../geode/internal/InternalDataSerializer.java     | 157 ++--
 .../org/apache/geode/internal/InternalEntity.java  |   4 +-
 .../geode/internal/InternalInstantiator.java       |  10 +-
 .../InternalStatisticsDisabledException.java       |   6 +-
 .../org/apache/geode/internal/JarDeployer.java     |  20 +-
 .../org/apache/geode/internal/ManagerInfo.java     |  13 +-
 .../org/apache/geode/internal/MigrationClient.java |  10 +-
 .../org/apache/geode/internal/MigrationServer.java |  28 +-
 .../java/org/apache/geode/internal/NanoTimer.java  |  21 +-
 .../geode/internal/NullDataOutputStream.java       |  17 +-
 .../java/org/apache/geode/internal/OSProcess.java  |  51 +-
 .../apache/geode/internal/ObjIdConcurrentMap.java  |  32 +-
 .../java/org/apache/geode/internal/ObjIdMap.java   |   4 +-
 .../geode/internal/ObjToByteArraySerializer.java   |   4 +-
 .../apache/geode/internal/OneTaskOnlyExecutor.java |  14 +-
 .../apache/geode/internal/PdxSerializerObject.java |   6 +-
 .../apache/geode/internal/ProcessOutputReader.java |   2 +-
 .../org/apache/geode/internal/PureJavaMode.java    |   6 +-
 .../ScheduledThreadPoolExecutorWithKeepAlive.java  |   8 +-
 .../java/org/apache/geode/internal/Sendable.java   |   4 +-
 .../geode/internal/SerializationVersions.java      |   2 +-
 .../java/org/apache/geode/internal/SetUtils.java   |   4 +-
 .../org/apache/geode/internal/SharedLibrary.java   |  14 +-
 .../java/org/apache/geode/internal/SmHelper.java   |   8 +-
 .../org/apache/geode/internal/SystemAdmin.java     |  18 +-
 .../geode/internal/SystemFailureTestHook.java      |   2 +-
 .../org/apache/geode/internal/SystemTimer.java     |  34 +-
 .../apache/geode/internal/UniqueIdGenerator.java   |  14 +-
 .../java/org/apache/geode/internal/Version.java    |  24 +-
 .../apache/geode/internal/VersionDescription.java  | 212 +++++
 .../geode/internal/VersionedDataInputStream.java   |   4 +-
 .../geode/internal/VersionedDataOutputStream.java  |   4 +-
 .../geode/internal/VersionedDataSerializable.java  |   2 +-
 .../apache/geode/internal/VersionedDataStream.java |   4 +-
 .../geode/internal/VersionedObjectInput.java       |   4 +-
 .../geode/internal/VersionedObjectOutput.java      |   4 +-
 .../org/apache/geode/internal/admin/Alert.java     |  22 +-
 .../apache/geode/internal/admin/ApplicationVM.java |   2 -
 .../geode/internal/admin/CacheCollector.java       |   7 +-
 .../org/apache/geode/internal/admin/CacheInfo.java |   2 +-
 .../admin/ClientHealthMonitoringRegion.java        |   4 +-
 .../internal/admin/ClientMembershipMessage.java    |  10 +-
 .../geode/internal/admin/ClientStatsManager.java   |   6 +-
 .../internal/admin/CompoundEntrySnapshot.java      |   5 +-
 .../internal/admin/CompoundRegionSnapshot.java     |   1 +
 .../org/apache/geode/internal/admin/DLockInfo.java |   1 +
 .../org/apache/geode/internal/admin/GemFireVM.java |  30 +-
 .../geode/internal/admin/GfManagerAgent.java       |   3 +-
 .../apache/geode/internal/admin/ListenerIdMap.java |   4 +-
 .../org/apache/geode/internal/admin/SSLConfig.java |   3 +-
 .../java/org/apache/geode/internal/admin/Stat.java |   1 -
 .../org/apache/geode/internal/admin/StatAlert.java |  16 +-
 .../geode/internal/admin/StatAlertDefinition.java  |  10 +-
 .../geode/internal/admin/StatAlertsManager.java    |  30 +-
 .../apache/geode/internal/admin/StatResource.java  |   1 -
 .../geode/internal/admin/TransportConfig.java      |   1 -
 .../admin/remote/AddHealthListenerRequest.java     |   8 +-
 .../admin/remote/AddHealthListenerResponse.java    |   9 +-
 .../admin/remote/AddStatListenerRequest.java       |   7 +-
 .../admin/remote/AddStatListenerResponse.java      |   6 +-
 .../remote/AdminConsoleDisconnectMessage.java      |   4 +-
 .../admin/remote/AdminFailureResponse.java         |   7 +-
 .../geode/internal/admin/remote/AdminRegion.java   |  22 +-
 .../geode/internal/admin/remote/AdminRequest.java  |   3 -
 .../geode/internal/admin/remote/AdminResponse.java |   6 +-
 .../geode/internal/admin/remote/AdminWaiters.java  |   2 +-
 .../admin/remote/AlertLevelChangeMessage.java      |   2 +-
 .../admin/remote/AlertListenerMessage.java         |   9 +-
 .../admin/remote/AlertsNotificationMessage.java    |   4 +-
 .../admin/remote/AppCacheSnapshotMessage.java      |   8 +-
 .../internal/admin/remote/BridgeServerRequest.java |   4 +-
 .../internal/admin/remote/CacheConfigRequest.java  |   9 +-
 .../internal/admin/remote/CacheConfigResponse.java |   2 +-
 .../internal/admin/remote/CacheInfoRequest.java    |   8 +-
 .../internal/admin/remote/CacheInfoResponse.java   |   2 +-
 .../admin/remote/CancelStatListenerRequest.java    |   6 +-
 .../admin/remote/CancelStatListenerResponse.java   |   8 +-
 .../internal/admin/remote/CancellationMessage.java |   7 +-
 .../admin/remote/CancellationRegistry.java         |   5 +-
 .../admin/remote/ChangeRefreshIntervalMessage.java |   4 +-
 .../internal/admin/remote/ClientHealthStats.java   |  29 +-
 .../internal/admin/remote/DestroyEntryMessage.java |   3 -
 .../admin/remote/DestroyRegionMessage.java         |   3 -
 .../admin/remote/DistributionLocatorId.java        |  24 +-
 .../admin/remote/DurableClientInfoRequest.java     |  11 +-
 .../admin/remote/DurableClientInfoResponse.java    |   2 +-
 .../internal/admin/remote/EntryValueNodeImpl.java  |  10 +-
 .../admin/remote/FetchDistLockInfoRequest.java     |   6 +-
 .../admin/remote/FetchDistLockInfoResponse.java    |  10 +-
 .../admin/remote/FetchHealthDiagnosisRequest.java  |   9 +-
 .../admin/remote/FetchHealthDiagnosisResponse.java |   8 +-
 .../internal/admin/remote/FetchHostRequest.java    |   4 +-
 .../internal/admin/remote/FetchHostResponse.java   |  23 +-
 .../remote/FetchResourceAttributesRequest.java     |   6 +-
 .../remote/FetchResourceAttributesResponse.java    |   5 +-
 .../internal/admin/remote/FetchStatsRequest.java   |   6 +-
 .../internal/admin/remote/FetchStatsResponse.java  |  13 +-
 .../internal/admin/remote/FetchSysCfgRequest.java  |   4 +-
 .../internal/admin/remote/FetchSysCfgResponse.java |   8 +-
 .../admin/remote/FlushAppCacheSnapshotMessage.java |   5 +-
 .../admin/remote/HealthListenerMessage.java        |  12 +-
 .../internal/admin/remote/LicenseInfoRequest.java  |   6 +-
 .../internal/admin/remote/LicenseInfoResponse.java |  14 +-
 .../admin/remote/ObjectDetailsRequest.java         |   7 +-
 .../admin/remote/ObjectDetailsResponse.java        |   9 +-
 .../internal/admin/remote/ObjectNamesRequest.java  |   6 +-
 .../internal/admin/remote/ObjectNamesResponse.java |   7 +-
 .../admin/remote/RefreshMemberSnapshotRequest.java |   5 +-
 .../internal/admin/remote/RegionAdminMessage.java  |   8 +-
 .../internal/admin/remote/RegionAdminRequest.java  |   9 +-
 .../admin/remote/RegionAttributesRequest.java      |   6 +-
 .../admin/remote/RegionAttributesResponse.java     |   6 +-
 .../geode/internal/admin/remote/RegionRequest.java |   7 +-
 .../internal/admin/remote/RegionResponse.java      |  11 +-
 .../internal/admin/remote/RegionSizeRequest.java   |   6 +-
 .../internal/admin/remote/RegionSizeResponse.java  |   8 +-
 .../admin/remote/RegionStatisticsRequest.java      |   6 +-
 .../admin/remote/RegionStatisticsResponse.java     |   6 +-
 .../admin/remote/RegionSubRegionSizeRequest.java   |   2 +-
 .../admin/remote/RegionSubRegionsSizeResponse.java |   2 +-
 .../geode/internal/admin/remote/RemoteAlert.java   |  14 +-
 .../internal/admin/remote/RemoteApplicationVM.java |   4 +-
 .../internal/admin/remote/RemoteBridgeServer.java  |  12 +-
 .../admin/remote/RemoteCacheStatistics.java        |   3 +-
 .../internal/admin/remote/RemoteDLockInfo.java     |   9 +-
 .../internal/admin/remote/RemoteEntrySnapshot.java |   4 +-
 .../internal/admin/remote/RemoteGemFireVM.java     |  16 +-
 .../admin/remote/RemoteGfManagerAgent.java         |  32 +-
 .../internal/admin/remote/RemoteObjectName.java    |   8 +-
 .../admin/remote/RemoteRegionAttributes.java       |   4 +-
 .../admin/remote/RemoteRegionSnapshot.java         |   6 +-
 .../geode/internal/admin/remote/RemoteStat.java    |   4 +-
 .../internal/admin/remote/RemoteStatResource.java  |   3 +-
 .../admin/remote/RemoteTransportConfig.java        |  19 +-
 .../admin/remote/RemoveHealthListenerRequest.java  |   9 +-
 .../admin/remote/RemoveHealthListenerResponse.java |   9 +-
 .../admin/remote/ResetHealthStatusRequest.java     |   9 +-
 .../admin/remote/ResetHealthStatusResponse.java    |   9 +-
 .../internal/admin/remote/RootRegionRequest.java   |   6 +-
 .../remote/ShutdownAllGatewayHubsRequest.java      |   6 +-
 .../internal/admin/remote/ShutdownAllResponse.java |   4 +-
 .../admin/remote/SnapshotResultMessage.java        |   9 +-
 .../remote/StatAlertsManagerAssignMessage.java     |  16 +-
 .../internal/admin/remote/StatListenerMessage.java |   9 +-
 .../internal/admin/remote/StoreSysCfgRequest.java  |   7 +-
 .../internal/admin/remote/StoreSysCfgResponse.java |   6 +-
 .../internal/admin/remote/SubRegionRequest.java    |   6 +-
 .../internal/admin/remote/SubRegionResponse.java   |   8 +-
 .../internal/admin/remote/TailLogRequest.java      |   6 +-
 .../internal/admin/remote/TailLogResponse.java     |   9 +-
 .../admin/remote/UpdateAlertDefinitionMessage.java |  13 +-
 .../internal/admin/remote/VersionInfoRequest.java  |   8 +-
 .../internal/admin/remote/VersionInfoResponse.java |  11 +-
 .../admin/remote/VersionMismatchAlert.java         |   7 +-
 .../admin/statalerts/BaseDecoratorImpl.java        |  10 +-
 .../admin/statalerts/DummyStatisticInfoImpl.java   |   8 +-
 .../admin/statalerts/FunctionDecoratorImpl.java    |   4 +-
 .../internal/admin/statalerts/FunctionHelper.java  |  26 +-
 .../statalerts/GaugeThresholdDecoratorImpl.java    |   4 +-
 .../admin/statalerts/MultiAttrDefinitionImpl.java  |   9 +-
 .../statalerts/NumberThresholdDecoratorImpl.java   |   4 +-
 .../admin/statalerts/SingleAttrDefinitionImpl.java |  14 +-
 .../internal/admin/statalerts/StatisticInfo.java   |  15 +-
 .../admin/statalerts/StatisticInfoImpl.java        |   8 +-
 .../internal/cache/AbstractBucketRegionQueue.java  |  19 +-
 .../geode/internal/cache/AbstractCacheServer.java  |   8 +-
 .../geode/internal/cache/AbstractDiskRegion.java   |  33 +-
 .../geode/internal/cache/AbstractLRURegionMap.java |  22 +-
 .../geode/internal/cache/AbstractRegion.java       |  16 +-
 .../geode/internal/cache/AbstractRegionMap.java    |  11 +-
 .../internal/cache/AbstractUpdateOperation.java    |   4 +-
 .../apache/geode/internal/cache/AcceptHelper.java  |   6 +-
 .../cache/AddCacheServerProfileMessage.java        |   1 -
 .../apache/geode/internal/cache/BackupLock.java    |   4 +-
 .../apache/geode/internal/cache/BackupManager.java |   6 +-
 .../apache/geode/internal/cache/BackupUtil.java    |   2 +-
 .../apache/geode/internal/cache/BucketAdvisor.java | 104 +--
 .../apache/geode/internal/cache/BucketDump.java    |   4 +-
 .../internal/cache/BucketNotFoundException.java    |   4 +-
 .../internal/cache/BucketPersistenceAdvisor.java   |   6 +-
 .../internal/cache/BucketRedundancyTracker.java    |   2 +-
 .../apache/geode/internal/cache/BucketRegion.java  |  62 +-
 .../geode/internal/cache/BucketRegionEvictior.java |   7 +-
 .../geode/internal/cache/BucketRegionQueue.java    |   8 +-
 .../geode/internal/cache/BucketServerLocation.java |   4 +-
 .../internal/cache/BucketServerLocation66.java     |   4 +-
 .../internal/cache/BytesAndBitsForCompactor.java   |   4 +-
 .../geode/internal/cache/CacheClientStatus.java    |   3 +-
 .../apache/geode/internal/cache/CacheConfig.java   |   6 +-
 .../internal/cache/CacheDistributionAdvisee.java   |  14 +-
 .../internal/cache/CacheDistributionAdvisor.java   |  30 +-
 .../internal/cache/CacheLifecycleListener.java     |   2 +-
 .../apache/geode/internal/cache/CacheObserver.java |  32 +-
 .../geode/internal/cache/CacheObserverAdapter.java |  12 +-
 .../geode/internal/cache/CacheObserverHolder.java  |  16 +-
 .../geode/internal/cache/CachePerfStats.java       |  18 +-
 .../geode/internal/cache/CacheServerAdvisor.java   |   2 +-
 .../geode/internal/cache/CacheServerImpl.java      |  32 +-
 .../geode/internal/cache/CacheServerLauncher.java  |   6 +-
 .../apache/geode/internal/cache/CacheService.java  |   6 +-
 .../geode/internal/cache/CacheServiceProfile.java  |   4 +-
 .../geode/internal/cache/CacheStatisticsImpl.java  |   3 -
 .../geode/internal/cache/CachedDeserializable.java |  14 +-
 .../cache/CachedDeserializableFactory.java         |   8 +-
 .../internal/cache/ClientRegionEventImpl.java      |  12 +-
 .../geode/internal/cache/ClientServerObserver.java |  10 +-
 .../cache/ClientServerObserverAdapter.java         |   6 +-
 .../internal/cache/ClientServerObserverHolder.java |   2 +-
 .../cache/ClientSubscriptionConfigImpl.java        |  20 +-
 .../geode/internal/cache/CloseCacheMessage.java    |   1 -
 .../internal/cache/ClusterConfigurationLoader.java |   6 +-
 .../geode/internal/cache/ColocationHelper.java     |   8 +-
 .../geode/internal/cache/ColocationLogger.java     |   8 +-
 .../geode/internal/cache/CommitReplyException.java |   4 +-
 .../geode/internal/cache/CompactableOplog.java     |   4 +-
 .../apache/geode/internal/cache/Conflatable.java   |  16 +-
 .../geode/internal/cache/ControllerAdvisor.java    |   2 +-
 .../internal/cache/CountingDataInputStream.java    |   4 +-
 .../internal/cache/CreateRegionProcessor.java      |   2 +-
 .../internal/cache/CustomEntryExpiryTask.java      |   2 +-
 .../internal/cache/DataLocationException.java      |   2 +-
 .../cache/DestroyPartitionedRegionMessage.java     |  14 +-
 .../internal/cache/DestroyRegionOperation.java     |   6 +-
 .../geode/internal/cache/DestroyedEntry.java       |   2 +-
 .../geode/internal/cache/DirectReplyMessage.java   |   8 +-
 .../geode/internal/cache/DirectoryHolder.java      |   4 +-
 .../geode/internal/cache/DiskDirectoryStats.java   |   2 -
 .../org/apache/geode/internal/cache/DiskId.java    |  47 +-
 .../apache/geode/internal/cache/DiskInitFile.java  |  54 +-
 .../apache/geode/internal/cache/DiskRegion.java    |  19 +-
 .../geode/internal/cache/DiskStoreAttributes.java  |  22 +-
 .../geode/internal/cache/DiskStoreBackup.java      |   4 +-
 .../geode/internal/cache/DiskStoreFactoryImpl.java |   4 +-
 .../apache/geode/internal/cache/DiskStoreImpl.java |  68 +-
 .../geode/internal/cache/DiskStoreMonitor.java     |   4 +-
 .../geode/internal/cache/DiskStoreStats.java       |   1 -
 .../internal/cache/DiskWriteAttributesImpl.java    |  48 +-
 .../geode/internal/cache/DistPeerTXStateStub.java  |  12 +-
 .../internal/cache/DistTXAdjunctCommitMessage.java |   2 +
 .../geode/internal/cache/DistTXCommitMessage.java  |  14 +-
 .../internal/cache/DistTXCoordinatorInterface.java |   4 +-
 .../internal/cache/DistTXRollbackMessage.java      |  12 +-
 .../apache/geode/internal/cache/DistTXState.java   |  34 +-
 .../internal/cache/DistTXStateOnCoordinator.java   |  18 +-
 .../geode/internal/cache/DistTXStateProxyImpl.java |   2 +-
 .../cache/DistTXStateProxyImplOnCoordinator.java   |   2 +-
 .../internal/cache/DistributedCacheOperation.java  |  44 +-
 .../internal/cache/DistributedClearOperation.java  |   8 +-
 .../internal/cache/DistributedPutAllOperation.java |  17 +-
 .../geode/internal/cache/DistributedRegion.java    |  42 +-
 .../DistributedRegionFunctionStreamingMessage.java |   6 +-
 .../cache/DistributedRemoveAllOperation.java       |  15 +-
 .../cache/DistributedTombstoneOperation.java       |  20 +-
 .../internal/cache/DynamicRegionFactoryImpl.java   |   2 +-
 .../apache/geode/internal/cache/EntriesMap.java    |  10 +-
 .../geode/internal/cache/EntryEventImpl.java       |  85 +-
 .../geode/internal/cache/EntryExpiryTask.java      |   9 +-
 .../geode/internal/cache/EntryOperationImpl.java   |  12 +-
 .../apache/geode/internal/cache/EntrySnapshot.java |  12 +-
 .../geode/internal/cache/EnumListenerEvent.java    |   8 +-
 .../org/apache/geode/internal/cache/EventID.java   |  76 +-
 .../apache/geode/internal/cache/EventIDHolder.java |   2 +-
 .../geode/internal/cache/EventStateHelper.java     |  22 +-
 .../internal/cache/EvictionAttributesImpl.java     |  20 +-
 .../geode/internal/cache/ExpirationScheduler.java  |   7 +-
 .../apache/geode/internal/cache/ExpiryTask.java    |  12 +-
 .../geode/internal/cache/ExportDiskRegion.java     |   2 +-
 .../apache/geode/internal/cache/FilterProfile.java |  46 +-
 .../geode/internal/cache/FilterRoutingInfo.java    |  22 +-
 .../geode/internal/cache/FindRemoteTXMessage.java  |   2 +-
 .../cache/FixedPartitionAttributesImpl.java        |  12 +-
 .../internal/cache/ForceReattemptException.java    |  12 +-
 .../cache/ForceableLinkedBlockingQueue.java        |   8 +-
 .../FunctionStreamingOrderedReplyMessage.java      |   2 +-
 .../geode/internal/cache/GatewayEventFilter.java   |   2 +-
 .../geode/internal/cache/GemFireCacheImpl.java     |  48 +-
 .../apache/geode/internal/cache/GridAdvisor.java   |   4 +-
 .../org/apache/geode/internal/cache/HARegion.java  |  34 +-
 .../geode/internal/cache/IdentityArrayList.java    |  12 +-
 .../apache/geode/internal/cache/ImageState.java    |   2 +-
 .../cache/InMemoryPersistentMemberView.java        |   2 +-
 .../internal/cache/InitialImageFlowControl.java    |   6 +-
 .../internal/cache/InitialImageOperation.java      |  58 +-
 .../apache/geode/internal/cache/InterestEvent.java |   6 +-
 .../geode/internal/cache/InternalCacheEvent.java   |  12 +-
 .../geode/internal/cache/InternalDataView.java     |  22 +-
 .../internal/cache/InternalRegionArguments.java    |   2 +-
 .../geode/internal/cache/InvalidateOperation.java  |   6 +-
 .../cache/InvalidatePartitionedRegionMessage.java  |  22 +-
 .../internal/cache/InvalidateRegionOperation.java  |   3 +-
 .../org/apache/geode/internal/cache/KeyInfo.java   |   2 +-
 .../cache/LatestLastAccessTimeMessage.java         |   2 +-
 .../cache/LatestLastAccessTimeOperation.java       |   2 +-
 .../cache/LatestLastAccessTimeReplyProcessor.java  |   2 +-
 .../geode/internal/cache/LoaderHelperFactory.java  |   4 +-
 .../geode/internal/cache/LoaderHelperImpl.java     |   8 +-
 .../apache/geode/internal/cache/LocalDataSet.java  |  16 +-
 .../apache/geode/internal/cache/LocalRegion.java   | 135 +--
 .../geode/internal/cache/LocalRegionDataView.java  |  40 +-
 .../cache/MemberFunctionStreamingMessage.java      |   2 +-
 .../java/org/apache/geode/internal/cache/Node.java |   6 +-
 .../cache/NonLocalRegionEntryWithStats.java        |   2 +-
 .../org/apache/geode/internal/cache/OpType.java    |   8 +-
 .../org/apache/geode/internal/cache/Oplog.java     | 110 +--
 .../geode/internal/cache/OrderedTombstoneMap.java  |  10 +-
 .../apache/geode/internal/cache/OverflowOplog.java |  39 +-
 .../internal/cache/PRHARedundancyProvider.java     | 111 +--
 .../geode/internal/cache/PRQueryProcessor.java     |  17 +-
 .../internal/cache/PartitionAttributesImpl.java    |  24 +-
 .../internal/cache/PartitionRegionConfig.java      |  16 +-
 .../cache/PartitionRegionConfigValidator.java      |   8 +-
 .../geode/internal/cache/PartitionedRegion.java    | 241 +++---
 .../cache/PartitionedRegionBucketMgmtHelper.java   |   6 +-
 .../internal/cache/PartitionedRegionDataStore.java | 142 +--
 .../internal/cache/PartitionedRegionException.java |   2 +-
 .../internal/cache/PartitionedRegionHelper.java    |  32 +-
 .../cache/PartitionedRegionQueryEvaluator.java     |  29 +-
 .../cache/PartitionedRegionRedundancyTracker.java  |   5 +-
 .../internal/cache/PartitionedRegionStats.java     | 204 ++---
 .../geode/internal/cache/PeerTXStateStub.java      |   2 +-
 .../geode/internal/cache/PersistentOplogSet.java   |  43 +-
 .../geode/internal/cache/PoolFactoryImpl.java      |   4 +-
 .../geode/internal/cache/PoolManagerImpl.java      |  10 +-
 .../org/apache/geode/internal/cache/PoolStats.java |  32 +-
 .../internal/cache/ProfileExchangeProcessor.java   |   4 +-
 .../geode/internal/cache/ProxyBucketRegion.java    |  15 +-
 .../geode/internal/cache/ProxyRegionMap.java       |   2 +-
 .../cache/PutAllPartialResultException.java        |   5 +-
 .../geode/internal/cache/QueuedOperation.java      |  13 +-
 .../internal/cache/RegionClearedException.java     |   2 +-
 .../apache/geode/internal/cache/RegionEntry.java   |  28 +-
 .../geode/internal/cache/RegionEntryContext.java   |   4 +-
 .../geode/internal/cache/RegionEntryFactory.java   |   2 +-
 .../geode/internal/cache/RegionEventImpl.java      |  29 +-
 .../geode/internal/cache/RegionEvictorTask.java    |   2 +-
 .../geode/internal/cache/RegionFactoryImpl.java    |   2 +-
 .../geode/internal/cache/RegionListener.java       |   4 +-
 .../org/apache/geode/internal/cache/RegionMap.java |  22 +-
 .../geode/internal/cache/RegionMapFactory.java     |   4 +-
 .../apache/geode/internal/cache/RegionQueue.java   |  40 +-
 .../geode/internal/cache/RegionQueueException.java |   2 +-
 .../apache/geode/internal/cache/RegionStatus.java  |   5 +-
 .../cache/RemoteContainsKeyValueMessage.java       |   8 +-
 .../geode/internal/cache/RemoteDestroyMessage.java |  19 +-
 .../internal/cache/RemoteFetchEntryMessage.java    |  10 +-
 .../internal/cache/RemoteFetchVersionMessage.java  |  10 +-
 .../geode/internal/cache/RemoteGetMessage.java     |  18 +-
 .../internal/cache/RemoteInvalidateMessage.java    |  14 +-
 .../internal/cache/RemoteOperationException.java   |  12 +-
 .../internal/cache/RemoteOperationMessage.java     |  22 +-
 .../RemoteOperationMessageWithDirectReply.java     |   4 +-
 .../geode/internal/cache/RemotePutAllMessage.java  |  14 +-
 .../geode/internal/cache/RemotePutMessage.java     |  18 +-
 .../internal/cache/RemoteRegionOperation.java      |   6 +-
 .../internal/cache/RemoteRemoveAllMessage.java     |  14 +-
 .../apache/geode/internal/cache/RoleEventImpl.java |   2 +-
 .../cache/SearchLoadAndWriteProcessor.java         |   4 +-
 .../geode/internal/cache/ServerPingMessage.java    |   6 +-
 .../geode/internal/cache/StateFlushOperation.java  |   1 -
 .../geode/internal/cache/TXCommitMessage.java      |  32 +-
 .../org/apache/geode/internal/cache/TXEntry.java   |   2 +-
 .../apache/geode/internal/cache/TXEntryState.java  |  79 +-
 .../geode/internal/cache/TXEntryStateFactory.java  |   4 +-
 .../geode/internal/cache/TXEntryUserAttrState.java |   4 +-
 .../org/apache/geode/internal/cache/TXEvent.java   |   5 +-
 .../geode/internal/cache/TXFarSideCMTracker.java   |   2 +-
 .../java/org/apache/geode/internal/cache/TXId.java |   9 +-
 .../apache/geode/internal/cache/TXLockRequest.java |  10 +-
 .../apache/geode/internal/cache/TXManagerImpl.java |  47 +-
 .../org/apache/geode/internal/cache/TXMessage.java |   2 +-
 .../apache/geode/internal/cache/TXRegionState.java |  18 +-
 .../internal/cache/TXRemoteCommitMessage.java      |   8 +-
 .../geode/internal/cache/TXReservationMgr.java     |   9 +-
 .../apache/geode/internal/cache/TXRmtEvent.java    |   6 +-
 .../org/apache/geode/internal/cache/TXState.java   |  92 +-
 .../geode/internal/cache/TXStateInterface.java     |  20 +-
 .../apache/geode/internal/cache/TXStateProxy.java  |   6 +-
 .../geode/internal/cache/TXStateProxyImpl.java     |   4 +-
 .../apache/geode/internal/cache/TXStateStub.java   |  84 +-
 .../internal/cache/TXSynchronizationRunnable.java  |   3 +-
 .../internal/cache/TestHeapThresholdObserver.java  |   4 +-
 .../internal/cache/TimestampedEntryEventImpl.java  |  10 +-
 .../org/apache/geode/internal/cache/Token.java     |   8 +-
 .../geode/internal/cache/TombstoneService.java     |  18 +-
 .../geode/internal/cache/TransactionMessage.java   |  12 +-
 .../geode/internal/cache/TxEntryFactory.java       |   4 +-
 .../internal/cache/UpdateAttributesProcessor.java  |  18 +-
 .../cache/UpdateEntryVersionOperation.java         |   6 +-
 .../geode/internal/cache/UpdateOperation.java      |   3 +-
 .../cache/UserSpecifiedDiskStoreAttributes.java    |   3 +-
 .../cache/UserSpecifiedRegionAttributes.java       |  10 +-
 .../internal/cache/VMCachedDeserializable.java     |   3 +-
 .../geode/internal/cache/VMLRURegionMap.java       |   1 -
 .../geode/internal/cache/ValidatingDiskRegion.java |   4 +-
 .../geode/internal/cache/ValueByteWrapper.java     |   6 +-
 .../geode/internal/cache/VersionTimestamp.java     |   2 +-
 .../internal/cache/WrappedCallbackArgument.java    |   2 +-
 .../cache/WrappedRegionMembershipListener.java     |  36 +-
 .../CompressedCachedDeserializable.java            |   8 +-
 .../SnappyCompressedCachedDeserializable.java      |   6 +-
 .../internal/cache/control/HeapMemoryMonitor.java  |  38 +-
 .../cache/control/InternalResourceManager.java     |  24 +-
 .../geode/internal/cache/control/MemoryEvent.java  |   1 -
 .../internal/cache/control/MemoryMonitor.java      |   4 +-
 .../internal/cache/control/MemoryThresholds.java   |  14 +-
 .../cache/control/OffHeapMemoryMonitor.java        |  20 +-
 .../control/PartitionRebalanceDetailsImpl.java     |   6 +-
 .../cache/control/RebalanceOperationImpl.java      |   2 +-
 .../internal/cache/control/ResourceAdvisor.java    |  12 +-
 .../internal/cache/control/ResourceListener.java   |   4 +-
 .../internal/cache/control/ResourceMonitor.java    |   6 +-
 .../cache/entries/AbstractDiskRegionEntry.java     |   2 +-
 .../cache/entries/AbstractRegionEntry.java         |  42 +-
 .../geode/internal/cache/entries/DiskEntry.java    |  18 +-
 .../internal/cache/entries/OffHeapRegionEntry.java |   6 +-
 .../VMStatsDiskLRURegionEntryHeapIntKey.java       |  11 +-
 .../VMStatsDiskLRURegionEntryHeapLongKey.java      |  11 +-
 .../VMStatsDiskLRURegionEntryHeapObjectKey.java    |  11 +-
 .../VMStatsDiskLRURegionEntryHeapStringKey1.java   |  11 +-
 .../VMStatsDiskLRURegionEntryHeapStringKey2.java   |  11 +-
 .../VMStatsDiskLRURegionEntryHeapUUIDKey.java      |  11 +-
 .../VMStatsDiskLRURegionEntryOffHeapIntKey.java    |  13 +-
 .../VMStatsDiskLRURegionEntryOffHeapLongKey.java   |  13 +-
 .../VMStatsDiskLRURegionEntryOffHeapObjectKey.java |  13 +-
 ...VMStatsDiskLRURegionEntryOffHeapStringKey1.java |  13 +-
 ...VMStatsDiskLRURegionEntryOffHeapStringKey2.java |  13 +-
 .../VMStatsDiskLRURegionEntryOffHeapUUIDKey.java   |  13 +-
 .../entries/VMStatsDiskRegionEntryHeapIntKey.java  |   9 +-
 .../entries/VMStatsDiskRegionEntryHeapLongKey.java |   9 +-
 .../VMStatsDiskRegionEntryHeapObjectKey.java       |   9 +-
 .../VMStatsDiskRegionEntryHeapStringKey1.java      |   9 +-
 .../VMStatsDiskRegionEntryHeapStringKey2.java      |   9 +-
 .../entries/VMStatsDiskRegionEntryHeapUUIDKey.java |   9 +-
 .../VMStatsDiskRegionEntryOffHeapIntKey.java       |   9 +-
 .../VMStatsDiskRegionEntryOffHeapLongKey.java      |   9 +-
 .../VMStatsDiskRegionEntryOffHeapObjectKey.java    |   9 +-
 .../VMStatsDiskRegionEntryOffHeapStringKey1.java   |   9 +-
 .../VMStatsDiskRegionEntryOffHeapStringKey2.java   |   9 +-
 .../VMStatsDiskRegionEntryOffHeapUUIDKey.java      |   9 +-
 .../cache/entries/VMStatsLRURegionEntry.java       |   1 -
 .../entries/VMStatsLRURegionEntryHeapIntKey.java   |   7 +-
 .../entries/VMStatsLRURegionEntryHeapLongKey.java  |   7 +-
 .../VMStatsLRURegionEntryHeapObjectKey.java        |   7 +-
 .../VMStatsLRURegionEntryHeapStringKey1.java       |   7 +-
 .../VMStatsLRURegionEntryHeapStringKey2.java       |   7 +-
 .../entries/VMStatsLRURegionEntryHeapUUIDKey.java  |   7 +-
 .../VMStatsLRURegionEntryOffHeapIntKey.java        |   9 +-
 .../VMStatsLRURegionEntryOffHeapLongKey.java       |   9 +-
 .../VMStatsLRURegionEntryOffHeapObjectKey.java     |   9 +-
 .../VMStatsLRURegionEntryOffHeapStringKey1.java    |   9 +-
 .../VMStatsLRURegionEntryOffHeapStringKey2.java    |   9 +-
 .../VMStatsLRURegionEntryOffHeapUUIDKey.java       |   9 +-
 .../internal/cache/entries/VMStatsRegionEntry.java |   1 -
 .../entries/VMStatsRegionEntryHeapIntKey.java      |   3 +-
 .../entries/VMStatsRegionEntryHeapLongKey.java     |   3 +-
 .../entries/VMStatsRegionEntryHeapObjectKey.java   |   3 +-
 .../entries/VMStatsRegionEntryHeapStringKey1.java  |   3 +-
 .../entries/VMStatsRegionEntryHeapStringKey2.java  |   3 +-
 .../entries/VMStatsRegionEntryHeapUUIDKey.java     |   3 +-
 .../entries/VMStatsRegionEntryOffHeapIntKey.java   |   3 +-
 .../entries/VMStatsRegionEntryOffHeapLongKey.java  |   3 +-
 .../VMStatsRegionEntryOffHeapObjectKey.java        |   3 +-
 .../VMStatsRegionEntryOffHeapStringKey1.java       |   3 +-
 .../VMStatsRegionEntryOffHeapStringKey2.java       |   3 +-
 .../entries/VMStatsRegionEntryOffHeapUUIDKey.java  |   3 +-
 .../VMThinDiskLRURegionEntryHeapIntKey.java        |   9 +-
 .../VMThinDiskLRURegionEntryHeapLongKey.java       |   9 +-
 .../VMThinDiskLRURegionEntryHeapObjectKey.java     |   9 +-
 .../VMThinDiskLRURegionEntryHeapStringKey1.java    |   9 +-
 .../VMThinDiskLRURegionEntryHeapStringKey2.java    |   9 +-
 .../VMThinDiskLRURegionEntryHeapUUIDKey.java       |   9 +-
 .../VMThinDiskLRURegionEntryOffHeapIntKey.java     |  11 +-
 .../VMThinDiskLRURegionEntryOffHeapLongKey.java    |  11 +-
 .../VMThinDiskLRURegionEntryOffHeapObjectKey.java  |  11 +-
 .../VMThinDiskLRURegionEntryOffHeapStringKey1.java |  11 +-
 .../VMThinDiskLRURegionEntryOffHeapStringKey2.java |  11 +-
 .../VMThinDiskLRURegionEntryOffHeapUUIDKey.java    |  11 +-
 .../cache/entries/VMThinDiskRegionEntry.java       |   2 -
 .../entries/VMThinDiskRegionEntryHeapIntKey.java   |   7 +-
 .../entries/VMThinDiskRegionEntryHeapLongKey.java  |   7 +-
 .../VMThinDiskRegionEntryHeapObjectKey.java        |   7 +-
 .../VMThinDiskRegionEntryHeapStringKey1.java       |   7 +-
 .../VMThinDiskRegionEntryHeapStringKey2.java       |   7 +-
 .../entries/VMThinDiskRegionEntryHeapUUIDKey.java  |   7 +-
 .../VMThinDiskRegionEntryOffHeapIntKey.java        |   7 +-
 .../VMThinDiskRegionEntryOffHeapLongKey.java       |   7 +-
 .../VMThinDiskRegionEntryOffHeapObjectKey.java     |   7 +-
 .../VMThinDiskRegionEntryOffHeapStringKey1.java    |   7 +-
 .../VMThinDiskRegionEntryOffHeapStringKey2.java    |   7 +-
 .../VMThinDiskRegionEntryOffHeapUUIDKey.java       |   7 +-
 .../cache/entries/VMThinLRURegionEntry.java        |   1 -
 .../entries/VMThinLRURegionEntryHeapIntKey.java    |   5 +-
 .../entries/VMThinLRURegionEntryHeapLongKey.java   |   5 +-
 .../entries/VMThinLRURegionEntryHeapObjectKey.java |   5 +-
 .../VMThinLRURegionEntryHeapStringKey1.java        |   5 +-
 .../VMThinLRURegionEntryHeapStringKey2.java        |   5 +-
 .../entries/VMThinLRURegionEntryHeapUUIDKey.java   |   5 +-
 .../entries/VMThinLRURegionEntryOffHeapIntKey.java |   7 +-
 .../VMThinLRURegionEntryOffHeapLongKey.java        |   7 +-
 .../VMThinLRURegionEntryOffHeapObjectKey.java      |   7 +-
 .../VMThinLRURegionEntryOffHeapStringKey1.java     |   7 +-
 .../VMThinLRURegionEntryOffHeapStringKey2.java     |   7 +-
 .../VMThinLRURegionEntryOffHeapUUIDKey.java        |   7 +-
 .../internal/cache/entries/VMThinRegionEntry.java  |   1 -
 .../cache/entries/VMThinRegionEntryHeapIntKey.java |   1 +
 .../entries/VMThinRegionEntryHeapLongKey.java      |   1 +
 .../entries/VMThinRegionEntryHeapObjectKey.java    |   1 +
 .../entries/VMThinRegionEntryHeapStringKey1.java   |   1 +
 .../entries/VMThinRegionEntryHeapStringKey2.java   |   1 +
 .../entries/VMThinRegionEntryHeapUUIDKey.java      |   1 +
 .../entries/VMThinRegionEntryOffHeapIntKey.java    |   1 +
 .../entries/VMThinRegionEntryOffHeapLongKey.java   |   1 +
 .../entries/VMThinRegionEntryOffHeapObjectKey.java |   1 +
 .../VMThinRegionEntryOffHeapStringKey1.java        |   1 +
 .../VMThinRegionEntryOffHeapStringKey2.java        |   1 +
 .../entries/VMThinRegionEntryOffHeapUUIDKey.java   |   1 +
 ...VersionedStatsDiskLRURegionEntryHeapIntKey.java |  14 +-
 ...ersionedStatsDiskLRURegionEntryHeapLongKey.java |  14 +-
 ...sionedStatsDiskLRURegionEntryHeapObjectKey.java |  14 +-
 ...ionedStatsDiskLRURegionEntryHeapStringKey1.java |  14 +-
 ...ionedStatsDiskLRURegionEntryHeapStringKey2.java |  14 +-
 ...ersionedStatsDiskLRURegionEntryHeapUUIDKey.java |  14 +-
 ...sionedStatsDiskLRURegionEntryOffHeapIntKey.java |  16 +-
 ...ionedStatsDiskLRURegionEntryOffHeapLongKey.java |  16 +-
 ...nedStatsDiskLRURegionEntryOffHeapObjectKey.java |  16 +-
 ...edStatsDiskLRURegionEntryOffHeapStringKey1.java |  16 +-
 ...edStatsDiskLRURegionEntryOffHeapStringKey2.java |  16 +-
 ...ionedStatsDiskLRURegionEntryOffHeapUUIDKey.java |  16 +-
 .../VersionedStatsDiskRegionEntryHeapIntKey.java   |  13 +-
 .../VersionedStatsDiskRegionEntryHeapLongKey.java  |  13 +-
 ...VersionedStatsDiskRegionEntryHeapObjectKey.java |  13 +-
 ...ersionedStatsDiskRegionEntryHeapStringKey1.java |  13 +-
 ...ersionedStatsDiskRegionEntryHeapStringKey2.java |  13 +-
 .../VersionedStatsDiskRegionEntryHeapUUIDKey.java  |  13 +-
 ...VersionedStatsDiskRegionEntryOffHeapIntKey.java |  15 +-
 ...ersionedStatsDiskRegionEntryOffHeapLongKey.java |  15 +-
 ...sionedStatsDiskRegionEntryOffHeapObjectKey.java |  15 +-
 ...ionedStatsDiskRegionEntryOffHeapStringKey1.java |  15 +-
 ...ionedStatsDiskRegionEntryOffHeapStringKey2.java |  15 +-
 ...ersionedStatsDiskRegionEntryOffHeapUUIDKey.java |  15 +-
 .../VersionedStatsLRURegionEntryHeapIntKey.java    |   8 +-
 .../VersionedStatsLRURegionEntryHeapLongKey.java   |   8 +-
 .../VersionedStatsLRURegionEntryHeapObjectKey.java |   8 +-
 ...VersionedStatsLRURegionEntryHeapStringKey1.java |   8 +-
 ...VersionedStatsLRURegionEntryHeapStringKey2.java |   8 +-
 .../VersionedStatsLRURegionEntryHeapUUIDKey.java   |   8 +-
 .../VersionedStatsLRURegionEntryOffHeapIntKey.java |  10 +-
 ...VersionedStatsLRURegionEntryOffHeapLongKey.java |  10 +-
 ...rsionedStatsLRURegionEntryOffHeapObjectKey.java |  10 +-
 ...sionedStatsLRURegionEntryOffHeapStringKey1.java |  10 +-
 ...sionedStatsLRURegionEntryOffHeapStringKey2.java |  10 +-
 ...VersionedStatsLRURegionEntryOffHeapUUIDKey.java |  10 +-
 .../VersionedStatsRegionEntryHeapIntKey.java       |   5 +-
 .../VersionedStatsRegionEntryHeapLongKey.java      |   5 +-
 .../VersionedStatsRegionEntryHeapObjectKey.java    |   5 +-
 .../VersionedStatsRegionEntryHeapStringKey1.java   |   5 +-
 .../VersionedStatsRegionEntryHeapStringKey2.java   |   5 +-
 .../VersionedStatsRegionEntryHeapUUIDKey.java      |   5 +-
 .../VersionedStatsRegionEntryOffHeapIntKey.java    |   7 +-
 .../VersionedStatsRegionEntryOffHeapLongKey.java   |   7 +-
 .../VersionedStatsRegionEntryOffHeapObjectKey.java |   7 +-
 ...VersionedStatsRegionEntryOffHeapStringKey1.java |   7 +-
 ...VersionedStatsRegionEntryOffHeapStringKey2.java |   7 +-
 .../VersionedStatsRegionEntryOffHeapUUIDKey.java   |   7 +-
 .../VersionedThinDiskLRURegionEntryHeapIntKey.java |  12 +-
 ...VersionedThinDiskLRURegionEntryHeapLongKey.java |  12 +-
 ...rsionedThinDiskLRURegionEntryHeapObjectKey.java |  12 +-
 ...sionedThinDiskLRURegionEntryHeapStringKey1.java |  12 +-
 ...sionedThinDiskLRURegionEntryHeapStringKey2.java |  12 +-
 ...VersionedThinDiskLRURegionEntryHeapUUIDKey.java |  12 +-
 ...rsionedThinDiskLRURegionEntryOffHeapIntKey.java |  14 +-
 ...sionedThinDiskLRURegionEntryOffHeapLongKey.java |  14 +-
 ...onedThinDiskLRURegionEntryOffHeapObjectKey.java |  14 +-
 ...nedThinDiskLRURegionEntryOffHeapStringKey1.java |  14 +-
 ...nedThinDiskLRURegionEntryOffHeapStringKey2.java |  14 +-
 ...sionedThinDiskLRURegionEntryOffHeapUUIDKey.java |  14 +-
 .../VersionedThinDiskRegionEntryHeapIntKey.java    |  11 +-
 .../VersionedThinDiskRegionEntryHeapLongKey.java   |  11 +-
 .../VersionedThinDiskRegionEntryHeapObjectKey.java |  11 +-
 ...VersionedThinDiskRegionEntryHeapStringKey1.java |  11 +-
 ...VersionedThinDiskRegionEntryHeapStringKey2.java |  11 +-
 .../VersionedThinDiskRegionEntryHeapUUIDKey.java   |  11 +-
 .../VersionedThinDiskRegionEntryOffHeapIntKey.java |  13 +-
 ...VersionedThinDiskRegionEntryOffHeapLongKey.java |  13 +-
 ...rsionedThinDiskRegionEntryOffHeapObjectKey.java |  13 +-
 ...sionedThinDiskRegionEntryOffHeapStringKey1.java |  13 +-
 ...sionedThinDiskRegionEntryOffHeapStringKey2.java |  13 +-
 ...VersionedThinDiskRegionEntryOffHeapUUIDKey.java |  13 +-
 .../VersionedThinLRURegionEntryHeapIntKey.java     |   6 +-
 .../VersionedThinLRURegionEntryHeapLongKey.java    |   6 +-
 .../VersionedThinLRURegionEntryHeapObjectKey.java  |   6 +-
 .../VersionedThinLRURegionEntryHeapStringKey1.java |   6 +-
 .../VersionedThinLRURegionEntryHeapStringKey2.java |   6 +-
 .../VersionedThinLRURegionEntryHeapUUIDKey.java    |   6 +-
 .../VersionedThinLRURegionEntryOffHeapIntKey.java  |   8 +-
 .../VersionedThinLRURegionEntryOffHeapLongKey.java |   8 +-
 ...ersionedThinLRURegionEntryOffHeapObjectKey.java |   8 +-
 ...rsionedThinLRURegionEntryOffHeapStringKey1.java |   8 +-
 ...rsionedThinLRURegionEntryOffHeapStringKey2.java |   8 +-
 .../VersionedThinLRURegionEntryOffHeapUUIDKey.java |   8 +-
 .../VersionedThinRegionEntryHeapIntKey.java        |   3 +-
 .../VersionedThinRegionEntryHeapLongKey.java       |   3 +-
 .../VersionedThinRegionEntryHeapObjectKey.java     |   3 +-
 .../VersionedThinRegionEntryHeapStringKey1.java    |   3 +-
 .../VersionedThinRegionEntryHeapStringKey2.java    |   3 +-
 .../VersionedThinRegionEntryHeapUUIDKey.java       |   3 +-
 .../VersionedThinRegionEntryOffHeapIntKey.java     |   5 +-
 .../VersionedThinRegionEntryOffHeapLongKey.java    |   5 +-
 .../VersionedThinRegionEntryOffHeapObjectKey.java  |   5 +-
 .../VersionedThinRegionEntryOffHeapStringKey1.java |   5 +-
 .../VersionedThinRegionEntryOffHeapStringKey2.java |   5 +-
 .../VersionedThinRegionEntryOffHeapUUIDKey.java    |   5 +-
 .../cache/event/DistributedEventTracker.java       |   6 +-
 .../internal/cache/execute/AbstractExecution.java  |   8 +-
 .../cache/execute/BucketMovedException.java        |   7 +-
 .../cache/execute/DefaultResultCollector.java      |  14 +-
 .../execute/DistributedRegionFunctionExecutor.java |  10 +-
 .../DistributedRegionFunctionResultSender.java     |   2 +-
 .../DistributedRegionFunctionResultWaiter.java     |   2 +-
 .../cache/execute/FunctionContextImpl.java         |  14 +-
 .../cache/execute/FunctionExecutionNodePruner.java |   6 +-
 .../cache/execute/FunctionRemoteContext.java       |   2 +-
 .../cache/execute/FunctionServiceStats.java        |  26 +-
 .../internal/cache/execute/FunctionStats.java      |  31 +-
 .../execute/FunctionStreamingResultCollector.java  |   4 +-
 .../internal/cache/execute/InternalExecution.java  |  16 +-
 .../cache/execute/InternalFunctionException.java   |  14 +-
 .../InternalFunctionInvocationTargetException.java |  10 +-
 .../cache/execute/InternalFunctionService.java     |  20 +-
 .../execute/InternalRegionFunctionContext.java     |  10 +-
 .../cache/execute/InternalResultSender.java        |   2 +-
 .../cache/execute/LocalResultCollector.java        |   2 +-
 .../cache/execute/MemberFunctionResultSender.java  |   6 +-
 .../cache/execute/MemberFunctionResultWaiter.java  |   2 +-
 .../cache/execute/MemberMappedArgument.java        |   8 +-
 .../cache/execute/MultiRegionFunctionContext.java  |  10 +-
 .../execute/MultiRegionFunctionContextImpl.java    |   6 +-
 .../execute/MultiRegionFunctionResultWaiter.java   |   2 +-
 .../geode/internal/cache/execute/NoResult.java     |  12 +-
 .../PartitionedRegionFunctionResultSender.java     |   6 +-
 .../PartitionedRegionFunctionResultWaiter.java     |   4 +-
 .../cache/execute/RegionFunctionContextImpl.java   |  14 +-
 .../cache/execute/ServerFunctionExecutor.java      |   4 +-
 .../execute/ServerRegionFunctionExecutor.java      |   2 +-
 .../ServerToClientFunctionResultSender65.java      |   2 +-
 .../cache/execute/StreamingFunctionOperation.java  |   1 +
 .../geode/internal/cache/extension/Extensible.java |   6 +-
 .../geode/internal/cache/extension/Extension.java  |   4 +-
 .../internal/cache/extension/ExtensionPoint.java   |  12 +-
 .../cache/extension/SimpleExtensionPoint.java      |   6 +-
 .../geode/internal/cache/ha/HAContainerMap.java    |   2 +-
 .../geode/internal/cache/ha/HARegionQueue.java     | 162 ++--
 .../internal/cache/ha/HARegionQueueAttributes.java |  18 +-
 .../internal/cache/ha/HARegionQueueStats.java      |  30 +-
 .../geode/internal/cache/ha/ThreadIdentifier.java  |  30 +-
 .../cache/locks/TXLessorDepartureHandler.java      |   1 -
 .../geode/internal/cache/locks/TXLockBatch.java    |  20 +-
 .../geode/internal/cache/locks/TXLockId.java       |   1 -
 .../geode/internal/cache/locks/TXLockIdImpl.java   |   7 +-
 .../geode/internal/cache/locks/TXLockService.java  |   7 +-
 .../internal/cache/locks/TXLockServiceImpl.java    |  14 +-
 .../locks/TXLockUpdateParticipantsMessage.java     |  17 +-
 .../cache/locks/TXOriginatorRecoveryProcessor.java |   1 -
 .../locks/TXRecoverGrantorMessageProcessor.java    |   8 +-
 .../internal/cache/locks/TXRegionLockRequest.java  |   5 +-
 .../apache/geode/internal/cache/lru/EnableLRU.java |   3 +-
 .../geode/internal/cache/lru/HeapEvictor.java      |  19 +-
 .../cache/lru/HeapLRUCapacityController.java       |  10 +-
 .../internal/cache/lru/HeapLRUStatistics.java      |   4 +-
 .../geode/internal/cache/lru/LRUAlgorithm.java     |  12 +-
 .../internal/cache/lru/LRUCapacityController.java  |  14 +-
 .../geode/internal/cache/lru/LRUClockNode.java     |   2 +-
 .../geode/internal/cache/lru/LRUMapCallbacks.java  |   6 +-
 .../geode/internal/cache/lru/LRUStatistics.java    |   1 -
 .../cache/lru/MemLRUCapacityController.java        |  13 +-
 .../geode/internal/cache/lru/NewLIFOClockHand.java |   2 +-
 .../geode/internal/cache/lru/NewLRUClockHand.java  |  10 +-
 .../apache/geode/internal/cache/lru/Sizeable.java  |  16 +-
 .../operations/ContainsKeyOperationContext.java    |   6 +-
 .../AllBucketProfilesUpdateMessage.java            |   5 +-
 .../partitioned/BecomePrimaryBucketMessage.java    |   6 +-
 .../geode/internal/cache/partitioned/Bucket.java   |   6 +-
 .../cache/partitioned/BucketBackupMessage.java     |   4 +-
 .../cache/partitioned/BucketCountLoadProbe.java    |   2 +-
 .../partitioned/BucketProfileUpdateMessage.java    |   4 +-
 .../cache/partitioned/BucketSizeMessage.java       |   8 +-
 .../cache/partitioned/ColocatedRegionDetails.java  |   8 +-
 .../cache/partitioned/ContainsKeyValueMessage.java |   6 +-
 .../cache/partitioned/CreateBucketMessage.java     |  16 +-
 .../partitioned/CreateMissingBucketsTask.java      |   2 +-
 .../partitioned/DeposePrimaryBucketMessage.java    |   2 +-
 .../internal/cache/partitioned/DestroyMessage.java |  14 +-
 .../DestroyRegionOnDataStoreMessage.java           |  16 +-
 .../cache/partitioned/DumpAllPRConfigMessage.java  |   2 +-
 .../internal/cache/partitioned/DumpB2NRegion.java  |   6 +-
 .../cache/partitioned/DumpBucketsMessage.java      |   2 +-
 .../partitioned/EndBucketCreationMessage.java      |   6 +-
 .../cache/partitioned/FetchBulkEntriesMessage.java |   8 +-
 .../cache/partitioned/FetchEntriesMessage.java     |  35 +-
 .../cache/partitioned/FetchEntryMessage.java       |   8 +-
 .../cache/partitioned/FetchKeysMessage.java        |  10 +-
 .../partitioned/FetchPartitionDetailsMessage.java  |   6 +-
 .../internal/cache/partitioned/FlushMessage.java   |   8 +-
 .../internal/cache/partitioned/GetMessage.java     |  33 +-
 .../cache/partitioned/IdentityRequestMessage.java  |  16 +-
 .../cache/partitioned/IdentityUpdateMessage.java   |   2 +-
 .../cache/partitioned/IndexCreationMsg.java        |  38 +-
 .../internal/cache/partitioned/InternalPRInfo.java |   8 +-
 .../partitioned/InternalPartitionDetails.java      |   6 +-
 .../cache/partitioned/InvalidateMessage.java       |  12 +-
 .../partitioned/ManageBackupBucketMessage.java     |  20 +-
 .../cache/partitioned/ManageBucketMessage.java     |  20 +-
 .../cache/partitioned/MoveBucketMessage.java       |   4 +-
 .../cache/partitioned/PREntriesIterator.java       |   2 +-
 .../geode/internal/cache/partitioned/PRLoad.java   |  12 +-
 .../partitioned/PRLocallyDestroyedException.java   |   2 +-
 .../cache/partitioned/PRSanityCheckMessage.java    |  14 +-
 .../cache/partitioned/PRTombstoneMessage.java      |   2 +-
 .../partitioned/PRUpdateEntryVersionMessage.java   |  12 +-
 .../cache/partitioned/PartitionMemberInfoImpl.java |   4 +-
 .../cache/partitioned/PartitionMessage.java        |  28 +-
 .../PartitionMessageWithDirectReply.java           |   4 +-
 .../partitioned/PartitionedRegionObserver.java     |   4 +-
 .../PartitionedRegionObserverAdapter.java          |   2 +-
 .../PartitionedRegionObserverHolder.java           |   2 +-
 .../partitioned/PartitionedRegionRebalanceOp.java  |  28 +-
 .../cache/partitioned/PrimaryRequestMessage.java   |  10 +-
 .../cache/partitioned/PutAllPRMessage.java         |   8 +-
 .../internal/cache/partitioned/PutMessage.java     |  18 +-
 .../internal/cache/partitioned/QueryMessage.java   |   4 +-
 .../cache/partitioned/RedundancyLogger.java        |   9 +-
 .../internal/cache/partitioned/RegionAdvisor.java  |  97 +--
 .../cache/partitioned/RemoteFetchKeysMessage.java  |  14 +-
 .../cache/partitioned/RemoteSizeMessage.java       |  12 +-
 .../cache/partitioned/RemoveAllPRMessage.java      |   8 +-
 .../cache/partitioned/RemoveBucketMessage.java     |   4 +-
 .../cache/partitioned/RemoveIndexesMessage.java    |  42 +-
 .../internal/cache/partitioned/SizeMessage.java    |  10 +-
 .../cache/partitioned/SizedBasedLoadProbe.java     |  10 +-
 .../partitioned/StreamingPartitionOperation.java   |   8 +-
 .../partitioned/rebalance/BucketOperator.java      |  12 +-
 .../partitioned/rebalance/CompositeDirector.java   |   6 +-
 .../cache/partitioned/rebalance/FPRDirector.java   |   4 +-
 .../cache/partitioned/rebalance/MoveBuckets.java   |   2 +-
 .../cache/partitioned/rebalance/MovePrimaries.java |   2 +-
 .../rebalance/ParallelBucketOperator.java          |  14 +-
 .../rebalance/PartitionedRegionLoadModel.java      |  24 +-
 .../rebalance/PercentageMoveDirector.java          |   6 +-
 .../partitioned/rebalance/RebalanceDirector.java   |  12 +-
 .../rebalance/RebalanceDirectorAdapter.java        |   2 +-
 .../partitioned/rebalance/SatisfyRedundancy.java   |   2 +-
 .../cache/persistence/BackupInspector.java         |  16 +-
 .../cache/persistence/CanonicalIdHolder.java       |  13 +-
 .../CreatePersistentRegionProcessor.java           |   4 +-
 .../cache/persistence/DiskInitFileParser.java      |   4 +-
 .../cache/persistence/DiskRecoveryStore.java       |   2 +-
 .../internal/cache/persistence/DiskStoreID.java    |   2 +-
 .../cache/persistence/PersistenceAdvisor.java      |  16 +-
 .../cache/persistence/PersistenceAdvisorImpl.java  |  13 +-
 .../cache/persistence/PersistentMemberID.java      |   2 +-
 .../cache/persistence/PersistentMemberManager.java |   4 +-
 .../cache/persistence/PersistentMemberPattern.java |   4 +-
 .../cache/persistence/PersistentMemberView.java    |  12 +-
 .../persistence/PersistentMembershipView.java      |   2 +-
 .../internal/cache/persistence/RestoreScript.java  |   2 +-
 .../internal/cache/persistence/query/IndexMap.java |  18 +-
 .../cache/persistence/query/ResultBag.java         |  12 +-
 .../cache/persistence/query/ResultList.java        |   4 +-
 .../cache/persistence/query/ResultMap.java         |  14 +-
 .../cache/persistence/query/ResultSet.java         |  12 +-
 .../query/TemporaryResultSetFactory.java           |  12 +-
 .../persistence/query/mock/ByteComparator.java     |   2 +-
 .../query/mock/CachedDeserializableComparator.java |   2 +-
 .../cache/persistence/query/mock/IndexMapImpl.java |   5 +-
 .../cache/persistence/query/mock/ItrAdapter.java   |   2 +-
 .../internal/cache/snapshot/ClientExporter.java    |   2 +-
 .../internal/cache/snapshot/ExportedRegistry.java  |   2 +-
 .../internal/cache/snapshot/FlowController.java    |  22 +-
 .../geode/internal/cache/snapshot/GFSnapshot.java  |  18 +-
 .../internal/cache/snapshot/LocalExporter.java     |   2 +-
 .../cache/snapshot/ParallelSnapshotFileMapper.java |   2 +-
 .../cache/snapshot/RegionSnapshotServiceImpl.java  |  40 +-
 .../cache/snapshot/SnapshotFileMapper.java         |  14 +-
 .../cache/snapshot/SnapshotOptionsImpl.java        |   2 +-
 .../internal/cache/snapshot/SnapshotPacket.java    |  26 +-
 .../internal/cache/snapshot/WindowedExporter.java  |  40 +-
 .../apache/geode/internal/cache/tier/Acceptor.java |   2 +-
 .../geode/internal/cache/tier/BatchException.java  |   6 +-
 .../internal/cache/tier/CachedRegionHelper.java    |   2 +-
 .../geode/internal/cache/tier/ClientHandShake.java |   2 +-
 .../geode/internal/cache/tier/ConnectionProxy.java |   2 +-
 .../geode/internal/cache/tier/InterestType.java    |   4 +-
 .../cache/tier/InternalClientMembership.java       |  27 +-
 .../geode/internal/cache/tier/MessageType.java     |  10 +-
 .../internal/cache/tier/sockets/AcceptorImpl.java  |  22 +-
 .../internal/cache/tier/sockets/BaseCommand.java   |  41 +-
 .../cache/tier/sockets/CacheClientNotifier.java    |  53 +-
 .../tier/sockets/CacheClientNotifierStats.java     |   2 +-
 .../cache/tier/sockets/CacheClientProxy.java       |  24 +-
 .../cache/tier/sockets/CacheClientProxyStats.java  |  32 +-
 .../cache/tier/sockets/CacheClientUpdater.java     |  32 +-
 .../cache/tier/sockets/CacheServerHelper.java      |  19 +-
 .../cache/tier/sockets/CacheServerStats.java       |   2 +-
 .../cache/tier/sockets/ChunkedMessage.java         |  44 +-
 .../tier/sockets/ClientBlacklistProcessor.java     |  17 +-
 .../tier/sockets/ClientDataSerializerMessage.java  |  10 +-
 .../cache/tier/sockets/ClientHealthMonitor.java    |  50 +-
 .../tier/sockets/ClientInstantiatorMessage.java    |  17 +-
 .../tier/sockets/ClientInterestMessageImpl.java    |   8 +-
 .../tier/sockets/ClientMarkerMessageImpl.java      |   4 +-
 .../internal/cache/tier/sockets/ClientMessage.java |   4 +-
 .../cache/tier/sockets/ClientPingMessageImpl.java  |   4 +-
 .../tier/sockets/ClientProxyMembershipID.java      |  53 +-
 .../cache/tier/sockets/ClientTombstoneMessage.java |   2 +-
 .../cache/tier/sockets/ClientUpdateMessage.java    |  20 +-
 .../tier/sockets/ClientUpdateMessageImpl.java      |  24 +-
 .../cache/tier/sockets/ClientUserAuths.java        |   2 +-
 .../cache/tier/sockets/CommBufferPool.java         |   4 +-
 .../cache/tier/sockets/CommandInitializer.java     |   2 +-
 .../cache/tier/sockets/ConnectionListener.java     |   6 +-
 .../tier/sockets/ConnectionListenerAdapter.java    |   2 +-
 .../cache/tier/sockets/HAEventWrapper.java         |  34 +-
 .../internal/cache/tier/sockets/HandShake.java     |  98 +--
 .../tier/sockets/InterestResultPolicyImpl.java     |   4 +-
 .../cache/tier/sockets/LegacyServerConnection.java |   6 +-
 .../geode/internal/cache/tier/sockets/Message.java |  29 +-
 .../internal/cache/tier/sockets/MessageStats.java  |   2 +-
 .../cache/tier/sockets/ObjectPartList.java         |  20 +-
 .../cache/tier/sockets/ObjectPartList651.java      |  12 +-
 .../tier/sockets/OldClientSupportService.java      |   8 +-
 .../geode/internal/cache/tier/sockets/Part.java    |   6 +-
 .../sockets/RemoveClientFromBlacklistMessage.java  |   2 +-
 .../tier/sockets/SerializedObjectPartList.java     |   4 +-
 .../cache/tier/sockets/ServerConnection.java       |  14 +-
 .../tier/sockets/ServerHandShakeProcessor.java     |  10 +-
 .../cache/tier/sockets/ServerQueueStatus.java      |  16 +-
 .../cache/tier/sockets/ServerResponseMatrix.java   |  12 +-
 .../cache/tier/sockets/UserAuthAttributes.java     |   2 +-
 .../cache/tier/sockets/VersionedObjectList.java    |  28 +-
 .../cache/tier/sockets/command/AddPdxEnum.java     |   2 +-
 .../cache/tier/sockets/command/AddPdxType.java     |   2 +-
 .../cache/tier/sockets/command/ClearRegion.java    |   2 +-
 .../cache/tier/sockets/command/ClientReady.java    |  10 +-
 .../tier/sockets/command/CloseConnection.java      |   4 +-
 .../cache/tier/sockets/command/CommitCommand.java  |  10 +-
 .../cache/tier/sockets/command/ContainsKey.java    |   2 +-
 .../cache/tier/sockets/command/ContainsKey66.java  |   2 +-
 .../cache/tier/sockets/command/CreateRegion.java   |   2 +-
 .../cache/tier/sockets/command/Default.java        |   8 +-
 .../cache/tier/sockets/command/Destroy.java        |   2 +-
 .../cache/tier/sockets/command/Destroy65.java      |   2 +-
 .../cache/tier/sockets/command/Destroy70.java      |   8 +-
 .../cache/tier/sockets/command/DestroyRegion.java  |   2 +-
 .../tier/sockets/command/ExecuteFunction.java      |   4 +-
 .../tier/sockets/command/ExecuteFunction65.java    |   2 +-
 .../tier/sockets/command/ExecuteFunction66.java    |   2 +-
 .../tier/sockets/command/ExecuteFunction70.java    |   2 +-
 .../sockets/command/ExecuteRegionFunction.java     |   2 +-
 .../sockets/command/ExecuteRegionFunction61.java   |   7 +-
 .../sockets/command/ExecuteRegionFunction65.java   |   3 +-
 .../sockets/command/ExecuteRegionFunction66.java   |   3 +-
 .../command/ExecuteRegionFunctionSingleHop.java    |   3 +-
 .../sockets/command/GatewayReceiverCommand.java    |   2 +-
 .../internal/cache/tier/sockets/command/Get70.java |   2 +-
 .../cache/tier/sockets/command/GetAll.java         |   2 +-
 .../cache/tier/sockets/command/GetAll651.java      |   2 +-
 .../cache/tier/sockets/command/GetAll70.java       |   2 +-
 .../cache/tier/sockets/command/GetAllForRI.java    |   8 +-
 .../tier/sockets/command/GetAllWithCallback.java   |   2 +-
 .../command/GetClientPRMetadataCommand.java        |   6 +-
 .../command/GetClientPRMetadataCommand66.java      |   6 +-
 .../GetClientPartitionAttributesCommand.java       |   6 +-
 .../GetClientPartitionAttributesCommand66.java     |   6 +-
 .../cache/tier/sockets/command/GetEntry70.java     |   4 +-
 .../tier/sockets/command/GetEntryCommand.java      |   4 +-
 .../tier/sockets/command/GetFunctionAttribute.java |   6 +-
 .../cache/tier/sockets/command/GetPDXEnumById.java |   2 +-
 .../tier/sockets/command/GetPDXIdForEnum.java      |   2 +-
 .../tier/sockets/command/GetPDXIdForType.java      |   2 +-
 .../cache/tier/sockets/command/GetPDXTypeById.java |   2 +-
 .../cache/tier/sockets/command/GetPdxEnums70.java  |   2 +-
 .../cache/tier/sockets/command/GetPdxTypes70.java  |   2 +-
 .../cache/tier/sockets/command/Invalid.java        |   8 +-
 .../cache/tier/sockets/command/Invalidate.java     |   2 +-
 .../cache/tier/sockets/command/Invalidate70.java   |   6 +-
 .../cache/tier/sockets/command/KeySet.java         |   2 +-
 .../cache/tier/sockets/command/MakePrimary.java    |   8 +-
 .../cache/tier/sockets/command/PeriodicAck.java    |   8 +-
 .../internal/cache/tier/sockets/command/Ping.java  |  10 +-
 .../internal/cache/tier/sockets/command/Put.java   |   2 +-
 .../internal/cache/tier/sockets/command/Put61.java |   2 +-
 .../internal/cache/tier/sockets/command/Put65.java |   2 +-
 .../internal/cache/tier/sockets/command/Put70.java |   8 +-
 .../cache/tier/sockets/command/PutAll.java         |   2 +-
 .../cache/tier/sockets/command/PutAll70.java       |   2 +-
 .../cache/tier/sockets/command/PutAll80.java       |   2 +-
 .../tier/sockets/command/PutAllWithCallback.java   |   3 +-
 .../tier/sockets/command/PutUserCredentials.java   |   2 +-
 .../internal/cache/tier/sockets/command/Query.java |   2 +-
 .../cache/tier/sockets/command/Query651.java       |   2 +-
 .../cache/tier/sockets/command/QueryGeode10.java   |   4 +-
 .../command/QueryWithParametersGeode10.java        |   4 +-
 .../sockets/command/RegisterDataSerializers.java   |   2 +-
 .../sockets/command/RegisterInstantiators.java     |   4 +-
 .../tier/sockets/command/RegisterInterest.java     |   4 +-
 .../tier/sockets/command/RegisterInterest61.java   |   2 +-
 .../tier/sockets/command/RegisterInterestList.java |   4 +-
 .../sockets/command/RegisterInterestList61.java    |   4 +-
 .../sockets/command/RegisterInterestList66.java    |   2 +-
 .../cache/tier/sockets/command/RemoveAll.java      |   2 +-
 .../cache/tier/sockets/command/RemoveUserAuth.java |   2 +-
 .../cache/tier/sockets/command/Request.java        |   2 +-
 .../tier/sockets/command/RequestEventValue.java    |   4 +-
 .../tier/sockets/command/RollbackCommand.java      |   2 +-
 .../internal/cache/tier/sockets/command/Size.java  |   2 +-
 .../sockets/command/TXSynchronizationCommand.java  |  16 +-
 .../tier/sockets/command/UnregisterInterest.java   |   2 +-
 .../sockets/command/UnregisterInterestList.java    |   2 +-
 .../sockets/command/UpdateClientNotification.java  |   4 +-
 .../internal/cache/tx/ClientTXRegionStub.java      |   4 +-
 .../geode/internal/cache/tx/ClientTXStateStub.java |   5 +-
 .../internal/cache/tx/DistClientTXStateStub.java   |   4 +-
 .../geode/internal/cache/tx/DistTxEntryEvent.java  |   4 +-
 .../internal/cache/tx/DistributedTXRegionStub.java |  10 +-
 .../internal/cache/tx/PartitionedTXRegionStub.java |  14 +-
 .../geode/internal/cache/tx/TXRegionStub.java      |   4 +-
 .../internal/cache/tx/TransactionalOperation.java  |   2 +-
 .../cache/versions/CompactVersionHolder.java       |   4 +-
 .../ConcurrentCacheModificationException.java      |   4 +-
 .../cache/versions/DiskRegionVersionVector.java    |   6 +-
 .../internal/cache/versions/DiskVersionTag.java    |   2 +-
 .../internal/cache/versions/RVVException.java      |  14 +-
 .../internal/cache/versions/RVVExceptionB.java     |   2 +-
 .../internal/cache/versions/RVVExceptionT.java     |   4 +-
 .../cache/versions/RegionVersionHolder.java        |  26 +-
 .../cache/versions/RegionVersionVector.java        |  73 +-
 .../cache/versions/VMRegionVersionVector.java      |   2 +-
 .../internal/cache/versions/VMVersionTag.java      |   4 +-
 .../internal/cache/versions/VersionSource.java     |   4 +-
 .../internal/cache/versions/VersionStamp.java      |   4 +-
 .../geode/internal/cache/versions/VersionTag.java  |   4 +-
 .../internal/cache/wan/AbstractGatewaySender.java  |  16 +-
 .../wan/AbstractGatewaySenderEventProcessor.java   |  14 +-
 .../wan/AsyncEventQueueConfigurationException.java |   8 +-
 .../geode/internal/cache/wan/BatchException70.java |   8 +-
 .../cache/wan/DistributedSystemListener.java       |   2 +-
 .../cache/wan/GatewayReceiverException.java        |   8 +-
 .../internal/cache/wan/GatewayReceiverStats.java   |   2 +-
 .../internal/cache/wan/GatewaySenderAdvisor.java   |   4 +-
 .../wan/GatewaySenderConfigurationException.java   |   6 +-
 .../wan/GatewaySenderEventCallbackArgument.java    |  29 +-
 .../wan/GatewaySenderEventCallbackDispatcher.java  |  14 +-
 .../internal/cache/wan/GatewaySenderEventImpl.java |  50 +-
 .../internal/cache/wan/GatewaySenderException.java |   6 +-
 .../internal/cache/wan/GatewaySenderStats.java     |  54 +-
 .../WaitUntilGatewaySenderFlushedCoordinator.java  |   5 +-
 .../ConcurrentParallelGatewaySenderQueue.java      |  17 +-
 .../wan/parallel/ParallelGatewaySenderQueue.java   |   4 +-
 .../parallel/ParallelQueueBatchRemovalMessage.java |   6 +-
 .../wan/parallel/ParallelQueueRemovalMessage.java  |   2 +-
 .../cache/wan/parallel/RREventIDResolver.java      |   4 +-
 ...tilParallelGatewaySenderFlushedCoordinator.java |  16 +-
 .../cache/wan/serial/BatchDestroyOperation.java    |   6 +-
 ...oncurrentSerialGatewaySenderEventProcessor.java |   6 +-
 .../serial/SerialGatewaySenderEventProcessor.java  |  20 +-
 .../cache/wan/serial/SerialGatewaySenderQueue.java |  28 +-
 .../internal/cache/xmlcache/AbstractXmlParser.java |   2 +-
 .../internal/cache/xmlcache/BindingCreation.java   |   8 +-
 .../internal/cache/xmlcache/CacheCreation.java     |  67 +-
 .../cache/xmlcache/CacheServerCreation.java        |   4 +-
 .../geode/internal/cache/xmlcache/CacheXml.java    |  55 +-
 .../internal/cache/xmlcache/CacheXmlGenerator.java |   8 +-
 .../internal/cache/xmlcache/CacheXmlParser.java    |  34 +-
 .../cache/xmlcache/CacheXmlPropertyResolver.java   |   6 +-
 .../xmlcache/CacheXmlPropertyResolverHelper.java   |   6 +-
 .../internal/cache/xmlcache/CacheXmlVersion.java   |  12 +-
 .../cache/xmlcache/ClientHaQueueCreation.java      |   2 +-
 .../geode/internal/cache/xmlcache/Declarable2.java |   3 +-
 .../cache/xmlcache/DefaultEntityResolver2.java     |   2 +-
 .../xmlcache/DiskStoreAttributesCreation.java      |   8 +-
 .../cache/xmlcache/GatewayReceiverCreation.java    |   6 +-
 .../cache/xmlcache/GeodeEntityResolver.java        |   6 +-
 .../internal/cache/xmlcache/IndexCreationData.java |   4 +-
 .../xmlcache/ParallelGatewaySenderCreation.java    |   2 +-
 .../cache/xmlcache/PivotalEntityResolver.java      |   6 +-
 .../internal/cache/xmlcache/PropertyResolver.java  |   4 +-
 .../cache/xmlcache/RegionAttributesCreation.java   |  16 +-
 .../internal/cache/xmlcache/RegionCreation.java    |   6 +-
 .../cache/xmlcache/ResourceManagerCreation.java    |  28 +-
 .../xmlcache/SerialAsyncEventQueueCreation.java    |   2 +-
 .../xmlcache/SerialGatewaySenderCreation.java      |   2 +-
 .../cache/xmlcache/SerializerCreation.java         |  16 +-
 .../internal/cache/xmlcache/XmlGenerator.java      |   6 +-
 .../internal/cache/xmlcache/XmlGeneratorUtils.java |  45 +-
 .../geode/internal/cache/xmlcache/XmlParser.java   |   8 +-
 .../org/apache/geode/internal/concurrent/AL.java   |   4 +-
 .../apache/geode/internal/concurrent/Atomics.java  |   4 +-
 .../concurrent/CompactConcurrentHashSet2.java      |  12 +-
 .../internal/concurrent/ConcurrentHashSet.java     |   2 +-
 .../org/apache/geode/internal/concurrent/LI.java   |   4 +-
 .../geode/internal/concurrent/MapCallback.java     |  36 +-
 .../geode/internal/concurrent/MapResult.java       |   2 +-
 .../internal/datasource/AbstractDataSource.java    |  34 +-
 .../internal/datasource/AbstractPoolCache.java     |  28 +-
 .../datasource/ClientConnectionFactoryWrapper.java |   2 +-
 .../geode/internal/datasource/ConfigProperty.java  |   2 +-
 .../datasource/ConfiguredDataSourceProperties.java |  38 +-
 .../datasource/ConnectionEventListenerAdaptor.java |   6 +-
 .../internal/datasource/ConnectionPoolCache.java   |   6 +-
 .../datasource/ConnectionPoolCacheImpl.java        |   4 +-
 .../internal/datasource/ConnectionProvider.java    |   6 +-
 .../datasource/ConnectionProviderException.java    |   4 +-
 .../datasource/DataSourceCreateException.java      |   4 +-
 .../internal/datasource/DataSourceFactory.java     |  24 +-
 .../datasource/FacetsJCAConnectionManagerImpl.java |  16 +-
 .../datasource/GemFireBasicDataSource.java         |  10 +-
 .../datasource/GemFireConnPooledDataSource.java    |  20 +-
 .../datasource/GemFireConnectionPoolManager.java   |  15 +-
 .../datasource/GemFireTransactionDataSource.java   |  20 +-
 .../datasource/JCAConnectionManagerImpl.java       |  13 +-
 .../internal/datasource/ManagedPoolCacheImpl.java  |   6 +-
 .../geode/internal/datasource/PoolException.java   |   4 +-
 .../internal/datasource/TranxPoolCacheImpl.java    |   6 +-
 .../org/apache/geode/internal/hll/HyperLogLog.java |   4 +-
 .../apache/geode/internal/hll/HyperLogLogPlus.java |   4 +-
 .../org/apache/geode/internal/hll/RegisterSet.java |   4 +-
 .../i18n/AbstractStringIdResourceBundle.java       |  14 +-
 .../geode/internal/i18n/LocalizedStrings.java      |   2 +-
 .../org/apache/geode/internal/i18n/StringId.java   |   8 +-
 .../geode/internal/io/CompositeOutputStream.java   |   4 +-
 .../io/MainWithChildrenRollingFileHandler.java     |   6 +-
 .../geode/internal/io/RollingFileHandler.java      |   4 +-
 .../apache/geode/internal/io/TeeOutputStream.java  |   2 +-
 .../apache/geode/internal/jndi/ContextImpl.java    | 120 +--
 .../internal/jndi/InitialContextFactoryImpl.java   |  13 +-
 .../apache/geode/internal/jndi/JNDIInvoker.java    |  29 +-
 .../apache/geode/internal/jndi/NameParserImpl.java |  11 +-
 .../geode/internal/jta/GlobalTransaction.java      |  54 +-
 .../apache/geode/internal/jta/TransactionImpl.java |  34 +-
 .../geode/internal/jta/TransactionManagerImpl.java |  34 +-
 .../geode/internal/jta/TransactionUtils.java       |   6 +-
 .../geode/internal/jta/UserTransactionImpl.java    |  21 +-
 .../org/apache/geode/internal/jta/XidImpl.java     |  10 +-
 .../org/apache/geode/internal/lang/ClassUtils.java |  14 +-
 .../org/apache/geode/internal/lang/Filter.java     |   2 +-
 .../apache/geode/internal/lang/InOutParameter.java |  14 +-
 .../org/apache/geode/internal/lang/Initable.java   |   2 +-
 .../geode/internal/lang/MutableIdentifiable.java   |   4 +-
 .../apache/geode/internal/lang/ObjectUtils.java    |  20 +-
 .../org/apache/geode/internal/lang/Orderable.java  |   4 +-
 .../org/apache/geode/internal/lang/Ordered.java    |   6 +-
 .../geode/internal/lang/SystemPropertyHelper.java  |   8 +-
 .../apache/geode/internal/lang/SystemUtils.java    |  22 +-
 .../apache/geode/internal/lang/ThrowableUtils.java |   2 +-
 .../geode/internal/logging/DateFormatter.java      |  12 +-
 .../geode/internal/logging/DebugLogWriter.java     |   8 +-
 .../geode/internal/logging/InternalLogWriter.java  |  26 +-
 .../geode/internal/logging/LocalLogWriter.java     |   6 +-
 .../apache/geode/internal/logging/LogConfig.java   |   2 +-
 .../apache/geode/internal/logging/LogService.java  |  19 +-
 .../geode/internal/logging/LogWriterFactory.java   |   4 +-
 .../geode/internal/logging/LogWriterImpl.java      | 106 +--
 .../geode/internal/logging/LoggingThreadGroup.java |   4 +-
 .../geode/internal/logging/ManagerLogWriter.java   |  20 +-
 .../geode/internal/logging/MergeLogFiles.java      |  14 +-
 .../geode/internal/logging/PureLogWriter.java      |  18 +-
 .../internal/logging/SecurityLocalLogWriter.java   |  10 +-
 .../geode/internal/logging/SecurityLogConfig.java  |   6 +-
 .../geode/internal/logging/SecurityLogWriter.java  |   4 +-
 .../internal/logging/SecurityManagerLogWriter.java |   8 +-
 .../internal/logging/StandardErrorPrinter.java     |   6 +-
 .../internal/logging/StandardOutputPrinter.java    |   6 +-
 .../internal/logging/log4j/AlertAppender.java      |   8 +-
 .../internal/logging/log4j/AppenderContext.java    |   7 +-
 .../internal/logging/log4j/ConfigLocator.java      |   4 +-
 .../geode/internal/logging/log4j/FastLogger.java   |   2 +-
 .../internal/logging/log4j/GemFireLogger.java      | 170 ++--
 .../internal/logging/log4j/LocalizedMessage.java   |   2 +-
 .../geode/internal/logging/log4j/LogLevel.java     |  19 +-
 .../internal/logging/log4j/LogWriterAppender.java  |  23 +-
 .../internal/logging/log4j/LogWriterAppenders.java |  28 +-
 .../internal/logging/log4j/LogWriterLogger.java    | 249 +++---
 .../log4j/message/GemFireParameterizedMessage.java |  16 +-
 .../GemFireParameterizedMessageFactory.java        |   2 +-
 .../apache/geode/internal/memcached/Command.java   |   4 +-
 .../geode/internal/memcached/CommandProcessor.java |   4 +-
 .../internal/memcached/ConnectionHandler.java      |   4 +-
 .../geode/internal/memcached/KeyWrapper.java       |   4 +-
 .../org/apache/geode/internal/memcached/Reply.java |   1 -
 .../geode/internal/memcached/RequestReader.java    |   4 +-
 .../geode/internal/memcached/ResponseStatus.java   |   2 +-
 .../geode/internal/memcached/ValueWrapper.java     |   6 +-
 .../memcached/commands/AbstractCommand.java        |   4 +-
 .../internal/memcached/commands/AddCommand.java    |   4 +-
 .../internal/memcached/commands/AddQCommand.java   |   2 +-
 .../internal/memcached/commands/AppendCommand.java |   2 +-
 .../memcached/commands/AppendQCommand.java         |   2 +-
 .../internal/memcached/commands/CASCommand.java    |   2 +-
 .../internal/memcached/commands/ClientError.java   |   2 +-
 .../memcached/commands/DecrementCommand.java       |   6 +-
 .../memcached/commands/DecrementQCommand.java      |   2 +-
 .../internal/memcached/commands/DeleteCommand.java |   2 +-
 .../memcached/commands/DeleteQCommand.java         |   2 +-
 .../memcached/commands/FlushAllQCommand.java       |   2 +-
 .../internal/memcached/commands/GATCommand.java    |   2 +-
 .../internal/memcached/commands/GATQCommand.java   |   2 +-
 .../internal/memcached/commands/GetCommand.java    |   4 +-
 .../internal/memcached/commands/GetKCommand.java   |   2 +-
 .../internal/memcached/commands/GetKQCommand.java  |   2 +-
 .../internal/memcached/commands/GetQCommand.java   |   2 +-
 .../memcached/commands/IncrementCommand.java       |   4 +-
 .../memcached/commands/IncrementQCommand.java      |   2 +-
 .../internal/memcached/commands/NoOpCommand.java   |   2 +-
 .../memcached/commands/NotSupportedCommand.java    |   2 +-
 .../memcached/commands/PrependCommand.java         |   2 +-
 .../memcached/commands/PrependQCommand.java        |   2 +-
 .../internal/memcached/commands/QuitCommand.java   |   6 +-
 .../internal/memcached/commands/QuitQCommand.java  |   2 +-
 .../memcached/commands/ReplaceCommand.java         |   4 +-
 .../memcached/commands/ReplaceQCommand.java        |   2 +-
 .../internal/memcached/commands/SetCommand.java    |   4 +-
 .../internal/memcached/commands/SetQCommand.java   |   2 +-
 .../internal/memcached/commands/StatsCommand.java  |   6 +-
 .../memcached/commands/StorageCommand.java         |   6 +-
 .../internal/memcached/commands/TouchCommand.java  |   2 +-
 .../memcached/commands/VerbosityCommand.java       |   6 +-
 .../memcached/commands/VersionCommand.java         |   2 +-
 .../internal/modules/util/RegionConfiguration.java |  27 +-
 .../internal/net/SSLConfigurationFactory.java      |  12 +-
 .../apache/geode/internal/net/SocketCloser.java    |  15 +-
 .../apache/geode/internal/net/SocketCreator.java   |   1 -
 .../geode/internal/net/SocketCreatorFactory.java   |   6 +-
 .../org/apache/geode/internal/net/SocketUtils.java |   6 +-
 .../internal/offheap/AddressableMemoryManager.java |   2 +-
 .../apache/geode/internal/offheap/DataType.java    |   2 +-
 .../apache/geode/internal/offheap/Fragment.java    |   2 +-
 .../geode/internal/offheap/FreeListManager.java    |  23 +-
 .../geode/internal/offheap/LifecycleListener.java  |  18 +-
 .../geode/internal/offheap/MemoryAllocator.java    |   6 +-
 .../internal/offheap/MemoryAllocatorImpl.java      |   2 +-
 .../apache/geode/internal/offheap/MemoryBlock.java |   2 +-
 .../geode/internal/offheap/MemoryInspector.java    |   2 +-
 .../internal/offheap/MemoryUsageListener.java      |   2 +-
 .../geode/internal/offheap/OffHeapHelper.java      |  10 +-
 .../geode/internal/offheap/OffHeapMemoryStats.java |   2 +-
 .../internal/offheap/OffHeapRegionEntryHelper.java |  12 +-
 .../geode/internal/offheap/OffHeapStorage.java     |  10 +-
 .../internal/offheap/OffHeapStoredObject.java      |  36 +-
 .../offheap/OutOfOffHeapMemoryListener.java        |   6 +-
 .../internal/offheap/ReferenceCountHelper.java     |   4 +-
 .../internal/offheap/ReferenceCountHelperImpl.java |   4 +-
 .../apache/geode/internal/offheap/Releasable.java  |   2 +-
 .../apache/geode/internal/offheap/SlabFactory.java |   2 +-
 .../apache/geode/internal/offheap/SlabImpl.java    |   2 +-
 .../geode/internal/offheap/StoredObject.java       |  14 +-
 .../offheap/annotations/OffHeapIdentifier.java     |   2 +-
 .../internal/offheap/annotations/Released.java     |   4 +-
 .../internal/offheap/annotations/Retained.java     |   4 +-
 .../internal/offheap/annotations/Unretained.java   |   4 +-
 .../geode/internal/process/AttachProcessUtils.java |   2 +-
 .../process/BlockingProcessStreamReader.java       |   4 +-
 .../process/ConnectionFailedException.java         |   2 +-
 .../internal/process/ControlFileWatchdog.java      |   2 +-
 .../process/ControlNotificationHandler.java        |   2 +-
 .../internal/process/ControllableProcess.java      |   6 +-
 .../process/FileAlreadyExistsException.java        |   2 +-
 .../internal/process/FileControllerParameters.java |   2 +-
 .../internal/process/FileProcessController.java    |  10 +-
 .../internal/process/LocalProcessLauncher.java     |  16 +-
 .../process/MBeanControllerParameters.java         |   2 +-
 .../process/MBeanInvocationFailedException.java    |   2 +-
 .../internal/process/MBeanProcessController.java   |  30 +-
 .../geode/internal/process/NativeProcessUtils.java |   2 +-
 .../process/NonBlockingProcessStreamReader.java    |   2 +-
 .../org/apache/geode/internal/process/PidFile.java |  14 +-
 .../internal/process/PidUnavailableException.java  |   2 +-
 .../geode/internal/process/ProcessController.java  |   4 +-
 .../internal/process/ProcessControllerFactory.java |   2 +-
 .../process/ProcessControllerParameters.java       |   4 +-
 .../internal/process/ProcessLauncherContext.java   |   6 +-
 .../internal/process/ProcessStreamReader.java      |   2 +-
 .../apache/geode/internal/process/ProcessType.java |   2 +-
 .../geode/internal/process/ProcessUtils.java       |  14 +-
 .../process/UnableToControlProcessException.java   |   2 +-
 .../geode/internal/security/AuthorizeRequest.java  |   4 +-
 .../internal/security/AuthorizeRequestPP.java      |   2 +-
 .../internal/security/CallbackInstantiator.java    |   7 +-
 .../internal/security/FilterPostAuthorization.java |   4 +-
 .../internal/security/FilterPreAuthorization.java  |   8 +-
 .../security/IntegratedSecurityService.java        |   2 +-
 .../security/SecurableCommunicationChannel.java    |   3 +-
 .../internal/security/SecurityServiceFactory.java  |   9 +-
 .../internal/security/shiro/CustomAuthRealm.java   |   9 +-
 .../security/shiro/JMXShiroAuthenticator.java      |   9 +-
 .../geode/internal/sequencelog/RegionLogger.java   |   4 +-
 .../geode/internal/sequencelog/SequenceLogger.java |   8 +-
 .../internal/sequencelog/SequenceLoggerImpl.java   |   8 +-
 .../sequencelog/io/GemfireLogConverter.java        |   4 +-
 .../geode/internal/sequencelog/model/Graph.java    |   2 +-
 .../apache/geode/internal/shared/NativeCalls.java  |  38 +-
 .../geode/internal/shared/NativeCallsJNAImpl.java  |  47 +-
 .../internal/shared/NativeErrorException.java      |   2 +-
 .../geode/internal/shared/StringPrintWriter.java   |   8 +-
 .../geode/internal/shared/TCPSocketOptions.java    |   2 +-
 .../geode/internal/size/ObjectGraphSizer.java      |  20 +-
 .../geode/internal/size/ObjectTraverser.java       |   8 +-
 .../geode/internal/size/ReflectionObjectSizer.java |  12 +-
 .../internal/size/ReflectionSingleObjectSizer.java |   2 +-
 .../geode/internal/size/SingleObjectSizer.java     |   2 +-
 .../internal/size/SizeClassOnceObjectSizer.java    |  10 +-
 .../apache/geode/internal/size/SizeOfUtil0.java    |   4 +-
 .../geode/internal/size/WellKnownClassSizer.java   |   2 +-
 .../statistics/AbstractStatisticsFactory.java      |  14 +-
 .../geode/internal/statistics/ArchiveSplitter.java |   2 +-
 .../geode/internal/statistics/CallbackSampler.java |   4 +-
 .../statistics/DummyStatisticsFactory.java         |   6 +-
 .../internal/statistics/GemFireStatSampler.java    |  30 +-
 .../geode/internal/statistics/HostStatHelper.java  |  11 +-
 .../geode/internal/statistics/HostStatSampler.java |  25 +-
 .../statistics/IgnoreResourceException.java        |   2 +-
 .../internal/statistics/LocalStatListener.java     |   4 +-
 .../internal/statistics/LocalStatisticsImpl.java   |   8 +-
 .../internal/statistics/ResourceInstance.java      |   2 +-
 .../geode/internal/statistics/ResourceType.java    |   2 +-
 .../geode/internal/statistics/SampleCollector.java |  19 +-
 .../geode/internal/statistics/SampleHandler.java   |  10 +-
 .../internal/statistics/SimpleStatSampler.java     |   2 +-
 .../internal/statistics/SimpleStatisticId.java     |   2 +-
 .../internal/statistics/StatArchiveDescriptor.java |   2 +-
 .../internal/statistics/StatArchiveHandler.java    |  39 +-
 .../statistics/StatArchiveHandlerConfig.java       |   2 +-
 .../internal/statistics/StatArchiveReader.java     |  28 +-
 .../internal/statistics/StatArchiveWriter.java     |  27 +-
 .../internal/statistics/StatMonitorHandler.java    |   9 +-
 .../internal/statistics/StatSamplerStats.java      |  36 +-
 .../geode/internal/statistics/StatisticId.java     |   2 +-
 .../geode/internal/statistics/StatisticsImpl.java  |   9 +-
 .../internal/statistics/StatisticsMonitor.java     |   8 +-
 .../internal/statistics/StatisticsSampler.java     |   6 +-
 .../statistics/StatisticsTypeFactoryImpl.java      |  10 +-
 .../internal/statistics/StatisticsTypeImpl.java    |   6 +-
 .../internal/statistics/StatisticsTypeXml.java     |  21 +-
 .../apache/geode/internal/statistics/VMStats.java  |  14 +-
 .../geode/internal/statistics/VMStatsContract.java |   2 +-
 .../geode/internal/statistics/ValueMonitor.java    |   6 +-
 .../statistics/platform/LinuxProcFsStatistics.java |  13 +-
 .../statistics/platform/LinuxProcessStats.java     |   6 +-
 .../statistics/platform/LinuxSystemStats.java      | 104 +--
 .../statistics/platform/OSXProcessStats.java       |   6 +-
 .../statistics/platform/OSXSystemStats.java        |  68 +-
 .../statistics/platform/OsStatisticsFactory.java   |   2 +-
 .../statistics/platform/SolarisProcessStats.java   |  64 +-
 .../statistics/platform/SolarisSystemStats.java    | 144 ++--
 .../statistics/platform/WindowsProcessStats.java   |  32 +-
 .../statistics/platform/WindowsSystemStats.java    |  90 +-
 .../internal/stats50/Atomic50StatisticsImpl.java   |  14 +-
 .../apache/geode/internal/stats50/VMStats50.java   | 124 +--
 .../apache/geode/internal/tcp/BaseMsgStreamer.java |   6 +-
 .../org/apache/geode/internal/tcp/Buffers.java     |   2 +-
 .../geode/internal/tcp/ByteBufferInputStream.java  |  34 +-
 .../geode/internal/tcp/ConnectExceptions.java      |   1 -
 .../org/apache/geode/internal/tcp/Connection.java  | 103 +--
 .../geode/internal/tcp/ConnectionException.java    |   2 +-
 .../apache/geode/internal/tcp/ConnectionTable.java |  34 +-
 .../tcp/ImmutableByteBufferInputStream.java        |  10 +-
 .../geode/internal/tcp/MemberShunnedException.java |   2 +-
 .../apache/geode/internal/tcp/MsgDestreamer.java   |  14 +-
 .../apache/geode/internal/tcp/MsgIdGenerator.java  |   4 +-
 .../apache/geode/internal/tcp/MsgOutputStream.java |  19 +-
 .../org/apache/geode/internal/tcp/MsgReader.java   |   8 +-
 .../org/apache/geode/internal/tcp/MsgStreamer.java |  49 +-
 .../apache/geode/internal/tcp/MsgStreamerList.java |   2 +-
 .../internal/tcp/ReenteredConnectException.java    |   2 +-
 .../apache/geode/internal/tcp/ServerDelegate.java  |   6 +-
 .../org/apache/geode/internal/tcp/TCPConduit.java  |  36 +-
 .../tcp/VersionedByteBufferInputStream.java        |   6 +-
 .../geode/internal/tcp/VersionedMsgStreamer.java   |   2 +-
 .../geode/internal/util/AbortableTaskService.java  |   4 +-
 .../geode/internal/util/ArgumentRedactor.java      |   8 +-
 .../org/apache/geode/internal/util/ArrayUtils.java |  21 +-
 .../apache/geode/internal/util/Breadcrumbs.java    |   8 +-
 .../geode/internal/util/CollectionUtils.java       |  32 +-
 .../apache/geode/internal/util/DelayedAction.java  |   4 +-
 .../java/org/apache/geode/internal/util/Hex.java   |   6 +-
 .../org/apache/geode/internal/util/IOUtils.java    |  33 +-
 .../geode/internal/util/JavaCommandBuilder.java    |   8 +-
 .../apache/geode/internal/util/LogFileUtils.java   |  16 +-
 .../geode/internal/util/ObjectIntProcedure.java    |   2 +-
 .../apache/geode/internal/util/PluckStacks.java    |   4 +-
 .../geode/internal/util/SingletonCallable.java     |   6 +-
 .../apache/geode/internal/util/SingletonValue.java |  16 +-
 .../geode/internal/util/StackTraceCollector.java   |  16 +-
 .../internal/util/SunAPINotFoundException.java     |   2 +-
 .../apache/geode/internal/util/TransformUtils.java |  12 +-
 .../apache/geode/internal/util/Transformer.java    |   2 +-
 .../apache/geode/internal/util/Versionable.java    |   4 +-
 .../geode/internal/util/VersionedArrayList.java    |  28 +-
 .../util/concurrent/CopyOnWriteHashMap.java        |   4 +-
 .../util/concurrent/CopyOnWriteWeakHashMap.java    |   2 +-
 .../concurrent/CustomEntryConcurrentHashMap.java   | 162 ++--
 .../internal/util/concurrent/FutureResult.java     |   1 +
 .../util/concurrent/ReentrantSemaphore.java        |   6 +-
 .../util/concurrent/SemaphoreReadWriteLock.java    |   2 +-
 .../util/concurrent/StoppableCondition.java        |   2 +-
 .../util/concurrent/StoppableCountDownLatch.java   |   6 +-
 .../concurrent/StoppableCountDownOrUpLatch.java    |   3 +-
 .../util/concurrent/StoppableNonReentrantLock.java |   4 +-
 .../util/concurrent/StoppableReadWriteLock.java    |   3 +-
 .../util/concurrent/StoppableReentrantLock.java    |   6 +-
 .../StoppableReentrantReadWriteLock.java           |  14 +-
 .../geode/lang/AttachAPINotFoundException.java     |   8 +-
 .../java/org/apache/geode/lang/Identifiable.java   |   4 +-
 .../geode/management/AlreadyRunningException.java  |   4 +-
 .../geode/management/AsyncEventQueueMXBean.java    |  16 +-
 .../org/apache/geode/management/BackupStatus.java  |   2 +-
 .../apache/geode/management/CacheServerMXBean.java |  36 +-
 .../geode/management/ClientHealthStatus.java       |   2 +-
 .../apache/geode/management/ClientQueueDetail.java |   2 +-
 .../management/DependenciesNotFoundException.java  |   6 +-
 .../apache/geode/management/DiskBackupResult.java  |   4 +-
 .../apache/geode/management/DiskBackupStatus.java  |   2 +-
 .../org/apache/geode/management/DiskMetrics.java   |   2 +-
 .../apache/geode/management/DiskStoreMXBean.java   |  22 +-
 .../management/DistributedLockServiceMXBean.java   |   4 +-
 .../geode/management/DistributedRegionMXBean.java  |  16 +-
 .../geode/management/DistributedSystemMXBean.java  |  40 +-
 .../geode/management/EvictionAttributesData.java   |   6 +-
 .../management/FixedPartitionAttributesData.java   |   6 +-
 .../geode/management/GatewayReceiverMXBean.java    |   6 +-
 .../geode/management/GatewaySenderMXBean.java      |  18 +-
 .../apache/geode/management/GemFireProperties.java |  16 +-
 .../geode/management/JMXNotificationType.java      |   4 +-
 .../geode/management/JMXNotificationUserData.java  |   2 +-
 .../org/apache/geode/management/JVMMetrics.java    |   2 +-
 .../org/apache/geode/management/LocatorMXBean.java |   6 +-
 .../apache/geode/management/LockServiceMXBean.java |   4 +-
 .../geode/management/ManagementException.java      |  12 +-
 .../apache/geode/management/ManagementService.java |  74 +-
 .../org/apache/geode/management/ManagerMXBean.java |  14 +-
 .../org/apache/geode/management/MemberMXBean.java  |  54 +-
 .../geode/management/MembershipAttributesData.java |   4 +-
 .../apache/geode/management/NetworkMetrics.java    |   2 +-
 .../org/apache/geode/management/OSMetrics.java     |   4 +-
 .../geode/management/PartitionAttributesData.java  |   2 +-
 .../geode/management/PersistentMemberDetails.java  |   2 +-
 .../geode/management/RegionAttributesData.java     |  23 +-
 .../org/apache/geode/management/RegionMXBean.java  |  18 +-
 .../apache/geode/management/ServerLoadData.java    |   2 +-
 .../apache/geode/management/cli/CliMetaData.java   |   2 +-
 .../management/cli/CommandProcessingException.java |   4 +-
 .../management/cli/CommandServiceException.java    |  10 +-
 .../geode/management/cli/CommandStatement.java     |   6 +-
 .../org/apache/geode/management/cli/Result.java    |  23 +-
 .../geode/management/internal/AgentUtil.java       |  11 +-
 .../geode/management/internal/AlertDetails.java    |   2 +-
 .../geode/management/internal/ArrayConverter.java  |   4 +-
 .../management/internal/BackupStatusImpl.java      |   2 +-
 .../management/internal/BaseManagementService.java |   2 +-
 .../management/internal/CollectionConverter.java   |   4 +-
 .../management/internal/CompositeConverter.java    |   4 +-
 .../management/internal/DiskBackupStatusImpl.java  |   1 -
 .../geode/management/internal/EnumConverter.java   |   4 +-
 .../management/internal/FederatingManager.java     |  24 +-
 .../management/internal/FederationComponent.java   |  20 +-
 .../geode/management/internal/JettyHelper.java     |  11 +-
 .../management/internal/JmxManagerAdvisor.java     |   4 +-
 .../internal/JmxManagerLocatorRequest.java         |   4 +-
 .../internal/JmxManagerLocatorResponse.java        |   2 +-
 .../geode/management/internal/LocalManager.java    |   6 +-
 .../geode/management/internal/MBeanJMXAdapter.java |  34 +-
 .../management/internal/MBeanProxyFactory.java     |  14 +-
 .../internal/MBeanProxyInfoRepository.java         |  14 +-
 .../internal/MBeanProxyInvocationHandler.java      |  27 +-
 .../internal/MXBeanProxyInvocationHandler.java     |  12 +-
 .../internal/ManagementCacheListener.java          |   6 +-
 .../management/internal/ManagementConstants.java   |   7 +-
 .../management/internal/ManagementFunction.java    |  10 +-
 .../internal/ManagementMembershipListener.java     |   4 +-
 .../internal/ManagementResourceRepo.java           |  36 +-
 .../geode/management/internal/MemberMessenger.java |  12 +-
 .../internal/MonitoringRegionCacheListener.java    |   4 +-
 .../internal/NotificationBroadCasterProxy.java     |   6 +-
 .../geode/management/internal/NotificationHub.java |  14 +-
 .../management/internal/NotificationHubClient.java |   8 +-
 .../geode/management/internal/NotificationKey.java |   4 +-
 .../geode/management/internal/OpenMethod.java      |   6 +-
 .../management/internal/OpenTypeConverter.java     |  28 +-
 .../geode/management/internal/OpenTypeUtil.java    |   6 +-
 .../geode/management/internal/ProxyInfo.java       |   6 +-
 .../geode/management/internal/ProxyInterface.java  |   4 +-
 .../geode/management/internal/ProxyListener.java   |  40 +-
 .../geode/management/internal/RestAgent.java       |  11 +-
 .../apache/geode/management/internal/SSLUtil.java  |   7 +-
 .../management/internal/StringBasedFilter.java     |   6 +-
 .../internal/SystemManagementService.java          |   4 +-
 .../geode/management/internal/TableConverter.java  |   4 +-
 .../internal/beans/AggregateHandler.java           |  12 +-
 .../internal/beans/AsyncEventQueueMBean.java       |   4 +-
 .../internal/beans/AsyncEventQueueMBeanBridge.java |   4 +-
 .../management/internal/beans/BeanUtilFuncs.java   |   4 +-
 .../internal/beans/CacheServerBridge.java          |   8 +-
 .../internal/beans/CacheServerMBean.java           |   4 +-
 .../internal/beans/DiskRegionBridge.java           |   4 +-
 .../management/internal/beans/DiskStoreMBean.java  |   4 +-
 .../internal/beans/DiskStoreMBeanBridge.java       |   4 +-
 .../beans/DistributedLockServiceBridge.java        |  26 +-
 .../beans/DistributedLockServiceMBean.java         |   4 +-
 .../internal/beans/DistributedRegionBridge.java    |  82 +-
 .../internal/beans/DistributedRegionMBean.java     |   4 +-
 .../internal/beans/DistributedSystemBridge.java    |  57 +-
 .../internal/beans/GatewayReceiverMBean.java       |   4 +-
 .../internal/beans/GatewayReceiverMBeanBridge.java |   2 +-
 .../internal/beans/GatewaySenderMBean.java         |   3 +-
 .../internal/beans/GatewaySenderMBeanBridge.java   |   4 +-
 .../management/internal/beans/LocatorMBean.java    |   4 +-
 .../internal/beans/LockServiceMBean.java           |   4 +-
 .../internal/beans/LockServiceMBeanBridge.java     |   8 +-
 .../management/internal/beans/MBeanAggregator.java |  32 +-
 .../internal/beans/ManagementAdapter.java          |  34 +-
 .../internal/beans/ManagementListener.java         |   8 +-
 .../management/internal/beans/ManagerMBean.java    |   2 +-
 .../management/internal/beans/MemberMBean.java     |   4 +-
 .../internal/beans/MemberMBeanBridge.java          |  14 +-
 .../internal/beans/MetricsCalculator.java          |   4 +-
 .../internal/beans/PartitionedRegionBridge.java    |   4 +-
 .../management/internal/beans/RegionMBean.java     |   6 +-
 .../internal/beans/RegionMBeanBridge.java          |  24 +-
 .../beans/RegionMBeanCompositeDataFactory.java     |   2 +-
 .../management/internal/beans/SequenceNumber.java  |   4 +-
 .../beans/stats/AggregateRegionStatsMonitor.java   |   6 +-
 .../internal/beans/stats/GCStatsMonitor.java       |   2 +-
 .../beans/stats/MemberLevelDiskMonitor.java        |   6 +-
 .../management/internal/beans/stats/StatType.java  |   2 +-
 .../internal/beans/stats/StatsAverageLatency.java  |   2 +-
 .../management/internal/beans/stats/StatsKey.java  |   2 +-
 .../internal/beans/stats/StatsLatency.java         |   2 +-
 .../management/internal/beans/stats/StatsRate.java |   2 +-
 .../internal/beans/stats/VMStatsMonitor.java       |   8 +-
 .../internal/cli/AbstractCliAroundInterceptor.java |   4 +-
 .../internal/cli/CliAroundInterceptor.java         |  10 +-
 .../geode/management/internal/cli/CliUtil.java     |   8 +-
 .../management/internal/cli/CommandManager.java    |   2 +-
 .../management/internal/cli/CommandRequest.java    |   2 +-
 .../management/internal/cli/CommandResponse.java   |  26 +-
 .../internal/cli/CommandResponseBuilder.java       |   2 +-
 .../internal/cli/CommandResponseWriter.java        |   4 +-
 .../management/internal/cli/GfshParseResult.java   |   8 +-
 .../cli/commands/CommandAvailabilityIndicator.java |   5 +-
 .../internal/cli/commands/ConnectCommand.java      |   5 +-
 .../internal/cli/commands/ExportLogsCommand.java   |   2 +-
 .../internal/cli/commands/StartMemberUtils.java    |   2 +-
 .../commands/lifecycle/StartJConsoleCommand.java   |  19 +-
 .../commands/lifecycle/StartJVisualVMCommand.java  |  13 +-
 .../cli/commands/lifecycle/StartVsdCommand.java    |  23 +-
 .../cli/commands/lifecycle/StopLocatorCommand.java |   9 +-
 .../cli/commands/lifecycle/StopServerCommand.java  |   9 +-
 .../converters/ClusterMemberIdNameConverter.java   |   6 +-
 .../converters/ConnectionEndpointConverter.java    |   2 +-
 .../cli/converters/DiskStoreNameConverter.java     |  17 +-
 .../internal/cli/converters/FilePathConverter.java |   9 +-
 .../cli/converters/FilePathStringConverter.java    |  13 +-
 .../converters/GatewayReceiverIdsConverter.java    |   8 +-
 .../cli/converters/GatewaySenderIdConverter.java   |  17 +-
 .../internal/cli/converters/HelpConverter.java     |   2 +-
 .../cli/converters/HintTopicConverter.java         |  15 +-
 .../LocatorDiscoveryConfigConverter.java           |   6 +-
 .../cli/converters/LocatorIdNameConverter.java     |   6 +-
 .../internal/cli/converters/LogLevelConverter.java |  11 +-
 .../cli/converters/MemberGroupConverter.java       |   2 +-
 .../cli/converters/MemberIdNameConverter.java      |   6 +-
 .../cli/converters/RegionPathConverter.java        |   2 +-
 .../cli/domain/AsyncEventQueueDetails.java         |   2 +-
 .../cli/domain/ConnectToLocatorResult.java         |   6 +-
 .../internal/cli/domain/DataCommandRequest.java    |   2 +-
 .../internal/cli/domain/DiskStoreDetails.java      |  13 +-
 .../cli/domain/EvictionAttributesInfo.java         |   2 +-
 .../cli/domain/FixedPartitionAttributesInfo.java   |   4 +-
 .../internal/cli/domain/IndexDetails.java          |   2 +-
 .../management/internal/cli/domain/IndexInfo.java  |   2 +-
 .../internal/cli/domain/MemberInformation.java     |   2 +-
 .../cli/domain/PartitionAttributesInfo.java        |   2 +-
 .../internal/cli/domain/RegionAttributesInfo.java  |   2 +-
 .../internal/cli/domain/RegionDescription.java     |  14 +-
 .../cli/domain/RegionDescriptionPerMember.java     |   2 +-
 .../internal/cli/domain/RegionInformation.java     |   6 +-
 .../cli/functions/AlterRuntimeConfigFunction.java  |  11 +-
 .../cli/functions/ChangeLogLevelFunction.java      |  19 +-
 .../internal/cli/functions/CliFunctionResult.java  |  12 +-
 .../cli/functions/ContinuousQueryFunction.java     |   1 +
 .../cli/functions/CreateDiskStoreFunction.java     |   2 +-
 .../cli/functions/DataCommandFunction.java         |   2 +-
 .../cli/functions/DescribeDiskStoreFunction.java   |  13 +-
 .../cli/functions/DestroyDiskStoreFunction.java    |   2 +-
 .../cli/functions/DestroyIndexFunction.java        |   2 +-
 .../internal/cli/functions/ExportDataFunction.java |   4 +-
 .../functions/FetchRegionAttributesFunction.java   |   5 +-
 .../FetchSharedConfigurationStatusFunction.java    |   1 +
 .../cli/functions/GarbageCollectionFunction.java   |  11 +-
 .../functions/GatewayReceiverCreateFunction.java   |   2 +-
 .../cli/functions/GatewaySenderCreateFunction.java |   2 +-
 .../functions/GatewaySenderDestroyFunction.java    |   3 +-
 .../GatewaySenderDestroyFunctionArgs.java          |   1 -
 .../GetMemberConfigInformationFunction.java        |  22 +-
 .../functions/GetMemberInformationFunction.java    |  18 +-
 .../functions/ListAsyncEventQueuesFunction.java    |   2 +-
 .../cli/functions/ListDeployedFunction.java        |   4 +-
 .../cli/functions/ListDiskStoresFunction.java      |   2 +-
 .../cli/functions/ListDurableCqNamesFunction.java  |   2 +-
 .../internal/cli/functions/ListIndexFunction.java  |   2 +-
 .../cli/functions/MembersForRegionFunction.java    |   2 +-
 .../internal/cli/functions/NetstatFunction.java    |   2 +-
 .../cli/functions/RegionAlterFunction.java         |   6 +-
 .../cli/functions/RegionDestroyFunction.java       |   2 +-
 .../internal/cli/functions/ShutDownFunction.java   |  21 +-
 .../cli/functions/SizeExportLogsFunction.java      |   6 +-
 .../internal/cli/functions/UndeployFunction.java   |   4 +-
 .../internal/cli/functions/UnregisterFunction.java |   8 +-
 .../cli/functions/UserFunctionExecution.java       |   1 -
 .../management/internal/cli/help/HelpBlock.java    |   7 +-
 .../geode/management/internal/cli/help/Helper.java |  23 +-
 .../geode/management/internal/cli/help/Topic.java  |   2 -
 .../management/internal/cli/json/GfJsonArray.java  |  21 +-
 .../internal/cli/json/GfJsonException.java         |   6 +-
 .../management/internal/cli/json/GfJsonObject.java |  22 +-
 .../management/internal/cli/json/TypedJson.java    |  10 +-
 .../internal/cli/modes/CommandModes.java           |   7 +-
 .../cli/remote/CommandExecutionContext.java        |   2 +-
 .../internal/cli/remote/CommandStatementImpl.java  |   4 +-
 .../internal/cli/remote/WrapperThreadLocal.java    |   6 +-
 .../internal/cli/result/AbstractResultData.java    |   6 +-
 .../internal/cli/result/CliJsonSerializable.java   |   4 +-
 .../cli/result/CliJsonSerializableIds.java         |   6 +-
 .../internal/cli/result/CommandResult.java         |   2 +-
 .../cli/result/CommandResultException.java         |   2 +-
 .../internal/cli/result/CompositeResultData.java   |  10 +-
 .../internal/cli/result/ErrorResultData.java       |  12 +-
 .../management/internal/cli/result/FileResult.java |   8 +-
 .../internal/cli/result/ObjectResultData.java      |   4 +-
 .../internal/cli/result/ResultBuilder.java         |  26 +-
 .../management/internal/cli/result/ResultData.java |   4 +-
 .../internal/cli/result/ResultDataException.java   |   2 +-
 .../internal/cli/result/TableBuilder.java          |  28 +-
 .../internal/cli/result/TabularResultData.java     |   6 +-
 .../management/internal/cli/shell/GfshConfig.java  |   7 +-
 .../internal/cli/shell/GfshExecutionStrategy.java  |   6 +-
 .../internal/cli/shell/JMXConnectionException.java |   2 +-
 .../internal/cli/shell/JMXInvocationException.java |   2 +-
 .../internal/cli/shell/JmxOperationInvoker.java    |   8 +-
 .../internal/cli/shell/MXBeanProvider.java         |   9 +-
 .../internal/cli/shell/MultiCommandHelper.java     |   4 +-
 .../internal/cli/shell/OperationInvoker.java       |  19 +-
 .../internal/cli/shell/jline/ANSIBuffer.java       |   8 +-
 .../internal/cli/shell/jline/ANSIHandler.java      |   2 +-
 .../cli/shell/jline/CygwinMinttyTerminal.java      |   4 +-
 .../internal/cli/shell/jline/GfshHistory.java      |   6 +-
 .../cli/shell/jline/GfshUnsupportedTerminal.java   |   2 +-
 .../cli/shell/unsafe/GfshSignalHandler.java        |   2 +-
 .../internal/cli/util/CLIConsoleBufferUtil.java    |   1 +
 .../management/internal/cli/util/CauseFinder.java  |  21 +-
 .../internal/cli/util/ClasspathScanLoadHelper.java |   6 +-
 .../internal/cli/util/CommandStringBuilder.java    |   2 +-
 .../internal/cli/util/CommentSkipHelper.java       |   2 +-
 .../internal/cli/util/ConnectionEndpoint.java      |   4 +-
 .../internal/cli/util/DiskStoreCompacter.java      |   4 +-
 .../cli/util/DiskStoreNotFoundException.java       |   2 +-
 .../internal/cli/util/DiskStoreValidater.java      |   1 +
 .../internal/cli/util/EvictionAttributesInfo.java  |   2 +-
 .../internal/cli/util/ExportLogsCacheWriter.java   |  11 +-
 .../cli/util/FixedPartitionAttributesInfo.java     |   2 -
 .../internal/cli/util/GfshConsoleReader.java       |   6 +-
 .../management/internal/cli/util/HostUtils.java    |   4 +-
 .../cli/util/JConsoleNotFoundException.java        |   2 +-
 .../management/internal/cli/util/JdkTool.java      |   8 +-
 .../management/internal/cli/util/JsonUtil.java     |  27 +-
 .../management/internal/cli/util/LogExporter.java  |  11 +-
 .../management/internal/cli/util/LogFilter.java    |   9 +-
 .../internal/cli/util/LogLevelExtractor.java       |   8 +-
 .../internal/cli/util/MemberInformation.java       |   2 +-
 .../internal/cli/util/MemberNotFoundException.java |   2 +-
 .../management/internal/cli/util/MergeLogs.java    |   4 +-
 .../internal/cli/util/ReadWriteFile.java           |   4 +-
 .../management/internal/cli/util/RegionPath.java   |   2 +-
 .../cli/util/VisualVmNotFoundException.java        |   2 +-
 .../callbacks/ConfigurationChangeListener.java     |  12 +-
 .../configuration/domain/CacheElement.java         |  12 +-
 .../configuration/domain/Configuration.java        |  11 +-
 .../internal/configuration/domain/XmlEntity.java   |  62 +-
 .../functions/GetRegionNamesFunction.java          |   4 +-
 .../configuration/functions/UploadJarFunction.java |   3 +-
 .../handlers/ConfigurationRequestHandler.java      |   2 +-
 .../messages/ConfigurationResponse.java            |  22 +-
 .../messages/SharedConfigurationStatusRequest.java |   2 +-
 .../SharedConfigurationStatusResponse.java         |   2 +-
 .../internal/configuration/utils/XmlConstants.java |   6 +-
 .../internal/configuration/utils/XmlUtils.java     |  34 +-
 .../internal/configuration/utils/ZipUtils.java     |   2 -
 .../internal/messages/CompactResponse.java         |   4 +-
 .../internal/security/AccessControlMBean.java      |   2 +-
 .../internal/security/AccessControlMXBean.java     |   2 +-
 .../internal/security/MBeanServerWrapper.java      |   2 +-
 .../internal/security/ResourceOperation.java       |   9 +-
 .../unsafe/ReadOpFileAccessController.java         |   2 +-
 .../controllers/AbstractCommandsController.java    |  12 +-
 .../support/LoginHandlerInterceptor.java           |   2 +-
 .../internal/web/domain/QueryParameterSource.java  |   3 +-
 .../SerializableObjectHttpMessageConverter.java    |   8 +-
 .../internal/web/http/support/HttpRequester.java   |   6 +-
 .../internal/web/io/MultipartFileAdapter.java      |   2 +-
 .../web/io/MultipartFileResourceAdapter.java       |   2 +-
 .../internal/web/shell/HttpOperationInvoker.java   |   2 +-
 .../internal/web/shell/MBeanAccessException.java   |   2 +-
 .../web/shell/support/HttpInvocationHandler.java   |   3 +-
 .../web/shell/support/HttpMBeanProxyFactory.java   |   3 +-
 .../management/internal/web/util/ConvertUtils.java |   8 +-
 .../management/internal/web/util/UriUtils.java     |  26 +-
 .../management/membership/ClientMembership.java    |   6 +-
 .../management/membership/MembershipEvent.java     |   2 +-
 .../UniversalMembershipListenerAdapter.java        |  19 +-
 .../geode/memcached/GemFireMemcachedServer.java    |  12 +-
 .../main/java/org/apache/geode/pdx/FieldType.java  |   2 +-
 .../java/org/apache/geode/pdx/JSONFormatter.java   |  17 +-
 .../apache/geode/pdx/JSONFormatterException.java   |   4 +-
 .../geode/pdx/NonPortableClassException.java       |   2 +-
 .../geode/pdx/PdxConfigurationException.java       |   6 +-
 .../geode/pdx/PdxFieldAlreadyExistsException.java  |   6 +-
 .../geode/pdx/PdxFieldDoesNotExistException.java   |   6 +-
 .../geode/pdx/PdxFieldTypeMismatchException.java   |   6 +-
 .../geode/pdx/PdxInitializationException.java      |   8 +-
 .../java/org/apache/geode/pdx/PdxInstance.java     |  22 +-
 .../org/apache/geode/pdx/PdxInstanceFactory.java   |  64 +-
 .../main/java/org/apache/geode/pdx/PdxReader.java  |  52 +-
 .../geode/pdx/PdxRegistryMismatchException.java    |   2 +-
 .../java/org/apache/geode/pdx/PdxSerializable.java |  16 +-
 .../geode/pdx/PdxSerializationException.java       |   8 +-
 .../java/org/apache/geode/pdx/PdxSerializer.java   |  22 +-
 .../java/org/apache/geode/pdx/PdxUnreadFields.java |   4 +-
 .../main/java/org/apache/geode/pdx/PdxWriter.java  |  64 +-
 .../geode/pdx/ReflectionBasedAutoSerializer.java   | 128 +--
 .../org/apache/geode/pdx/WritablePdxInstance.java  |   4 +-
 .../pdx/internal/AutoSerializableManager.java      |  65 +-
 .../org/apache/geode/pdx/internal/DataSize.java    |   2 +-
 .../org/apache/geode/pdx/internal/EnumInfo.java    |   2 +-
 .../geode/pdx/internal/InternalPdxReader.java      |   2 +-
 .../geode/pdx/internal/LonerTypeRegistration.java  |   2 +-
 .../org/apache/geode/pdx/internal/PdxField.java    |   2 +-
 .../apache/geode/pdx/internal/PdxInputStream.java  |  14 +-
 .../apache/geode/pdx/internal/PdxInstanceEnum.java |   4 +-
 .../apache/geode/pdx/internal/PdxOutputStream.java |   8 +-
 .../apache/geode/pdx/internal/PdxReaderImpl.java   |   4 +-
 .../org/apache/geode/pdx/internal/PdxString.java   |   3 +-
 .../org/apache/geode/pdx/internal/PdxType.java     |  10 +-
 .../apache/geode/pdx/internal/PdxUnreadData.java   |   2 +-
 .../apache/geode/pdx/internal/PdxWriterImpl.java   |   6 +-
 .../geode/pdx/internal/PeerTypeRegistration.java   |   4 +-
 .../geode/pdx/internal/TrackingPdxReaderImpl.java  |   4 +-
 .../geode/pdx/internal/TypeRegistration.java       |   6 +-
 .../apache/geode/pdx/internal/TypeRegistry.java    |  12 +-
 .../apache/geode/pdx/internal/UnreadPdxType.java   |   2 +-
 .../internal/WeakConcurrentIdentityHashMap.java    |   5 +-
 .../apache/geode/pdx/internal/json/PdxToJSON.java  |   1 +
 .../geode/pdx/internal/unsafe/UnsafeWrapper.java   |   2 +-
 .../org/apache/geode/redis/GeodeRedisServer.java   |  28 +-
 .../geode/redis/internal/ByteArrayWrapper.java     |   8 +-
 .../geode/redis/internal/ByteToCommandDecoder.java |  16 +-
 .../org/apache/geode/redis/internal/Coder.java     |  12 +-
 .../org/apache/geode/redis/internal/Command.java   |  18 +-
 .../apache/geode/redis/internal/DoubleWrapper.java |   2 +-
 .../redis/internal/ExecutionHandlerContext.java    |  40 +-
 .../org/apache/geode/redis/internal/Executor.java  |   4 +-
 .../apache/geode/redis/internal/Extendable.java    |   4 +-
 .../internal/RedisCommandParserException.java      |   2 +-
 .../geode/redis/internal/RedisCommandType.java     |   4 +-
 .../internal/RedisDataTypeMismatchException.java   |   2 +-
 .../redis/internal/RegionCreationException.java    |   2 +-
 .../geode/redis/internal/RegionProvider.java       |  18 +-
 .../redis/internal/executor/AbstractExecutor.java  |  10 +-
 .../redis/internal/executor/KeysExecutor.java      |   2 +-
 .../redis/internal/executor/ScanExecutor.java      |   2 +-
 .../redis/internal/executor/hash/HDelExecutor.java |   4 +-
 .../internal/executor/hash/HExistsExecutor.java    |   4 +-
 .../redis/internal/executor/hash/HGetExecutor.java |   4 +-
 .../internal/executor/hash/HIncrByExecutor.java    |   2 +-
 .../executor/hash/HIncrByFloatExecutor.java        |   4 +-
 .../redis/internal/executor/hash/HLenExecutor.java |   4 +-
 .../internal/executor/hash/HMGetExecutor.java      |   2 +-
 .../internal/executor/hash/HMSetExecutor.java      |   4 +-
 .../redis/internal/executor/hll/PFAddExecutor.java |   2 +-
 .../internal/executor/hll/PFMergeExecutor.java     |   2 +-
 .../internal/executor/list/LInsertExecutor.java    |   2 +-
 .../redis/internal/executor/list/LLenExecutor.java |   4 +-
 .../redis/internal/executor/list/LRemExecutor.java |   2 +-
 .../redis/internal/executor/list/LSetExecutor.java |   2 +-
 .../internal/executor/list/LTrimExecutor.java      |   2 +-
 .../redis/internal/executor/list/ListExecutor.java |  22 +-
 .../redis/internal/executor/list/PopExecutor.java  |  23 +-
 .../redis/internal/executor/list/PushExecutor.java |   2 +-
 .../redis/internal/executor/set/SCardExecutor.java |   2 +-
 .../internal/executor/set/SIsMemberExecutor.java   |   2 +-
 .../redis/internal/executor/set/SPopExecutor.java  |   2 +-
 .../internal/executor/set/SRandMemberExecutor.java |   4 +-
 .../redis/internal/executor/set/SRemExecutor.java  |   4 +-
 .../internal/executor/sortedset/ZAddExecutor.java  |   2 +-
 .../executor/sortedset/ZCountExecutor.java         |   2 +-
 .../executor/sortedset/ZIncrByExecutor.java        |   2 +-
 .../executor/sortedset/ZLexCountExecutor.java      |   2 +-
 .../executor/sortedset/ZRangeByLexExecutor.java    |   4 +-
 .../internal/executor/sortedset/ZRemExecutor.java  |   2 +-
 .../internal/executor/string/AppendExecutor.java   |   2 +-
 .../internal/executor/string/BitCountExecutor.java |   2 +-
 .../internal/executor/string/BitPosExecutor.java   |   2 +-
 .../internal/executor/string/DecrByExecutor.java   |   2 +-
 .../internal/executor/string/GetExecutor.java      |   4 +-
 .../internal/executor/string/GetRangeExecutor.java |   4 +-
 .../internal/executor/string/GetSetExecutor.java   |   2 +-
 .../internal/executor/string/IncrByExecutor.java   |   2 +-
 .../internal/executor/string/IncrExecutor.java     |   2 +-
 .../internal/executor/string/MSetExecutor.java     |   2 +-
 .../internal/executor/string/MSetNXExecutor.java   |   2 +-
 .../internal/executor/string/SetBitExecutor.java   |   2 +-
 .../internal/executor/string/SetExecutor.java      |   2 +-
 .../internal/executor/string/SetNXExecutor.java    |   2 +-
 .../internal/executor/string/SetRangeExecutor.java |   2 +-
 .../internal/executor/string/StrlenExecutor.java   |   4 +-
 .../executor/transactions/DiscardExecutor.java     |   2 +-
 .../executor/transactions/ExecExecutor.java        |   4 +-
 .../executor/transactions/MultiExecutor.java       |   2 +-
 .../executor/transactions/UnwatchExecutor.java     |   2 +-
 .../executor/transactions/WatchExecutor.java       |   2 +-
 .../internal/org/apache/hadoop/fs/GlobPattern.java |   8 +-
 .../org/apache/geode/security/AccessControl.java   |  18 +-
 .../org/apache/geode/security/AuthInitialize.java  |  14 +-
 .../security/AuthenticationFailedException.java    |   6 +-
 .../security/AuthenticationRequiredException.java  |   6 +-
 .../org/apache/geode/security/Authenticator.java   |  14 +-
 .../geode/security/GemFireSecurityException.java   |   3 +-
 .../geode/security/NotAuthorizedException.java     |   3 +-
 .../org/apache/geode/security/PostProcessor.java   |   2 +-
 .../apache/geode/security/ResourcePermission.java  |   3 +-
 .../org/apache/geode/security/SecurityManager.java |   4 +-
 .../java/batterytest/greplogs/ExpectedStrings.java |   4 +-
 .../src/test/java/com/examples/TestObject.java     |   1 -
 .../java/com/examples/ds/CompanySerializer.java    |   3 +-
 .../src/test/java/com/examples/ds/Employee.java    |   5 +-
 .../java/com/examples/ds/PutDataSerializables.java |   5 +-
 geode-core/src/test/java/com/examples/ds/User.java |   3 +-
 .../test/java/com/examples/snapshot/MyObject.java  |   2 +-
 .../java/com/main/MyDistributedSystemListener.java |   6 +-
 .../java/com/main/WANBootStrapping_Site1_Add.java  |  14 +-
 .../com/main/WANBootStrapping_Site1_Remove.java    |   6 +-
 .../java/com/main/WANBootStrapping_Site2_Add.java  |  16 +-
 .../com/main/WANBootStrapping_Site2_Remove.java    |   6 +-
 geode-core/src/test/java/hydra/MethExecutor.java   |   3 +-
 .../test/java/org/apache/geode/CopyJUnitTest.java  |  21 +-
 .../java/org/apache/geode/DataSerializerTest.java  |   5 +-
 .../test/java/org/apache/geode/DeltaTestImpl.java  |  10 +-
 .../apache/geode/DiskInstantiatorsJUnitTest.java   |  22 +-
 .../java/org/apache/geode/InstantiatorTest.java    |   5 +-
 .../apache/geode/JtaNoninvolvementJUnitTest.java   |  26 +-
 .../java/org/apache/geode/LonerDMJUnitTest.java    |  21 +-
 .../org/apache/geode/SetOperationTXJUnitTest.java  |  22 +-
 .../org/apache/geode/SystemFailureJUnitTest.java   |   2 +-
 .../java/org/apache/geode/TXExpiryJUnitTest.java   |  22 +-
 .../test/java/org/apache/geode/TXJUnitTest.java    |  24 +-
 .../org/apache/geode/TXWriterOOMEJUnitTest.java    |   2 +-
 .../java/org/apache/geode/TestDataSerializer.java  |  11 +-
 .../test/java/org/apache/geode/UnitTestDoclet.java |   1 -
 .../org/apache/geode/admin/AdminTestHelper.java    |   1 +
 .../geode/admin/RegionSubRegionSnapshotTest.java   |   5 +-
 .../internal/BindDistributedSystemJUnitTest.java   |  22 +-
 .../internal/CacheHealthEvaluatorJUnitTest.java    |  10 +-
 .../admin/internal/DistributedSystemTestCase.java  |   9 +-
 .../admin/internal/HealthEvaluatorTestCase.java    |  11 +-
 .../internal/MemberHealthEvaluatorJUnitTest.java   |   2 +-
 .../DeprecatedAgentLauncherIntegrationTest.java    |   2 +-
 .../geode/cache/AttributesFactoryJUnitTest.java    |   4 +-
 .../apache/geode/cache/CacheListenerJUnitTest.java |  27 +-
 .../geode/cache/ClientServerTimeSyncDUnitTest.java |  21 +-
 .../cache/ConnectionPoolAndLoaderDUnitTest.java    |   8 +-
 .../geode/cache/ConnectionPoolAutoDUnitTest.java   |   9 +-
 .../geode/cache/ConnectionPoolDUnitTest.java       |  66 +-
 .../cache/ConnectionPoolFactoryJUnitTest.java      |  21 +-
 .../geode/cache/DiskAccessExceptionTest.java       |   3 +-
 ...FinalStaticArrayShouldNotCauseSegFaultTest.java |  10 +-
 .../MembershipAttributesAreSerializableTest.java   |   3 +-
 .../apache/geode/cache/PoolManagerJUnitTest.java   |  25 +-
 .../org/apache/geode/cache/ProxyJUnitTest.java     |  23 +-
 .../apache/geode/cache/RegionFactoryJUnitTest.java |  39 +-
 .../geode/cache/RegionNameValidationJUnitTest.java |  11 +-
 .../RemoveAllCacheListenerPeerRegressionTest.java  |   7 +-
 .../apache/geode/cache/RoleExceptionJUnitTest.java |   1 -
 ...ncEventQueueEvictionAndExpirationJUnitTest.java |  34 +-
 .../SerialAsyncEventQueueImplJUnitTest.java        |  15 +-
 .../cache/client/ClientCacheFactoryJUnitTest.java  |  35 +-
 .../cache/client/ClientRegionFactoryJUnitTest.java |  31 +-
 .../ClientServerRegisterInterestsDUnitTest.java    |  17 +-
 ...AllCacheListenerClientServerRegressionTest.java |   5 +-
 .../cache/client/internal/AbstractOpTest.java      |   5 +-
 .../internal/AutoConnectionSourceDUnitTest.java    |   2 +-
 .../AutoConnectionSourceImplJUnitTest.java         |  73 +-
 .../CacheServerSSLConnectionDUnitTest.java         |  13 +-
 .../internal/ConnectionPoolImplJUnitTest.java      |  25 +-
 .../internal/LocatorLoadBalancingDUnitTest.java    |  41 +-
 .../cache/client/internal/LocatorTestBase.java     |  23 +-
 .../client/internal/OpExecutorImplJUnitTest.java   |   4 +-
 .../client/internal/QueueManagerJUnitTest.java     |  37 +-
 .../client/internal/SSLNoClientAuthDUnitTest.java  |   2 +-
 .../client/internal/ServerBlackListJUnitTest.java  |   2 +-
 ...pClientExecutorSubmitTaskWithExceptionTest.java |   4 +-
 .../locator/LocatorStatusResponseJUnitTest.java    |   2 +-
 .../pooling/ConnectionManagerJUnitTest.java        |  47 +-
 .../cache/execute/FunctionAdapterJUnitTest.java    |   4 +-
 .../geode/cache/execute/FunctionExceptionTest.java |   9 +-
 .../management/MXMemoryPoolListenerExample.java    |  27 +-
 .../management/MemoryThresholdsDUnitTest.java      |  28 +-
 .../MemoryThresholdsOffHeapDUnitTest.java          |  11 +-
 .../cache/management/ResourceManagerDUnitTest.java |   2 +-
 .../mapInterface/ExceptionHandlingJUnitTest.java   |  17 +-
 .../cache/mapInterface/MapFunctionalJUnitTest.java |  17 +-
 .../mapInterface/PutAllGlobalLockJUnitTest.java    |   2 +-
 .../operations/PutOperationContextJUnitTest.java   |  21 +-
 .../internal/GetOperationContextImplJUnitTest.java |  21 +-
 .../partition/PartitionRegionHelperDUnitTest.java  |  15 +-
 .../BaseLineAndCompareQueryPerfJUnitTest.java      |  28 +-
 .../query/Bug32947ValueConstraintJUnitTest.java    |  21 +-
 .../org/apache/geode/cache/query/BugJUnitTest.java |   2 +-
 .../org/apache/geode/cache/query/CacheUtils.java   |   9 +-
 .../cache/query/LocalQueryServiceJUnitTest.java    |  13 +-
 .../geode/cache/query/PdxStringQueryJUnitTest.java |  23 +-
 .../org/apache/geode/cache/query/PerfQuery.java    |   4 +-
 .../apache/geode/cache/query/QueryJUnitTest.java   |   4 +-
 .../apache/geode/cache/query/QueryTestUtils.java   |  25 +-
 .../geode/cache/query/QueryTestUtilsJUnitTest.java |   4 +-
 .../QueryWithBucketParameterIntegrationTest.java   |  10 +-
 .../apache/geode/cache/query/RegionJUnitTest.java  |   7 +-
 .../cache/query/TypedJsonQueryIntegrationTest.java |   2 +-
 .../java/org/apache/geode/cache/query/Utils.java   |   4 +-
 .../cache/query/cq/dunit/CqQueryTestListener.java  |  19 +-
 .../org/apache/geode/cache/query/data/Country.java |   2 +-
 .../apache/geode/cache/query/data/District.java    |   2 +-
 .../apache/geode/cache/query/data/Employee.java    |   2 -
 .../apache/geode/cache/query/data/Inventory.java   |   2 +-
 .../apache/geode/cache/query/data/Portfolio.java   |   4 +-
 .../geode/cache/query/data/PortfolioData.java      |   2 +-
 .../geode/cache/query/data/PortfolioNoDS.java      |   2 +-
 .../geode/cache/query/data/PortfolioPdx.java       |   8 +-
 .../apache/geode/cache/query/data/Position.java    |   1 +
 .../cache/query/data/ProhibitedSecurityQuote.java  |   2 +-
 .../org/apache/geode/cache/query/data/Quote.java   |   2 +-
 .../geode/cache/query/data/SecurityMaster.java     |   2 +-
 .../org/apache/geode/cache/query/data/State.java   |   4 +-
 .../org/apache/geode/cache/query/data/Student.java |   4 +-
 .../cache/query/dunit/CqTimeTestListener.java      |  12 +-
 .../geode/cache/query/dunit/GroupByDUnitImpl.java  |   2 +-
 .../dunit/GroupByPartitionedQueryDUnitTest.java    |  12 +-
 .../cache/query/dunit/GroupByQueryDUnitTest.java   |  12 +-
 .../geode/cache/query/dunit/HelperTestCase.java    |   1 -
 .../query/dunit/NonDistinctOrderByDUnitImpl.java   |  11 +-
 .../NonDistinctOrderByPartitionedDUnitTest.java    |  12 +-
 .../PdxLocalQueryVersionedClassDUnitTest.java      |   7 +-
 .../geode/cache/query/dunit/PdxQueryDUnitTest.java |  12 +-
 .../cache/query/dunit/PdxStringQueryDUnitTest.java |   6 +-
 .../cache/query/dunit/PositionPdxVersion.java      |   1 +
 .../cache/query/dunit/QueryAuthorization.java      |   2 +-
 .../dunit/QueryDataInconsistencyDUnitTest.java     |  15 +-
 .../dunit/QueryParamsAuthorizationDUnitTest.java   |   4 +-
 .../dunit/QueryUsingFunctionContextDUnitTest.java  |  18 +-
 .../cache/query/dunit/QueryUsingPoolDUnitTest.java |   6 +-
 .../cache/query/dunit/RemoteQueryDUnitTest.java    |  66 +-
 .../ResourceManagerWithQueryMonitorDUnitTest.java  |   4 +-
 .../geode/cache/query/facets/lang/Address.java     |   2 -
 .../geode/cache/query/facets/lang/Course.java      |   2 -
 .../geode/cache/query/facets/lang/Department.java  |   2 -
 .../geode/cache/query/facets/lang/G_Student.java   |   2 -
 .../geode/cache/query/facets/lang/Person.java      |   1 -
 .../geode/cache/query/facets/lang/Student.java     |   2 -
 .../geode/cache/query/facets/lang/UG_Student.java  |   2 -
 .../geode/cache/query/facets/lang/Utils.java       |  11 +-
 .../functional/ComparisonOperatorsJUnitTest.java   |   1 -
 .../cache/query/functional/CountStarJUnitTest.java |   2 +-
 ...tinctResultsWithDupValuesInRegionJUnitTest.java |  17 +-
 .../cache/query/functional/FunctionJUnitTest.java  |   2 +-
 .../functional/GroupByPartitionedJUnitTest.java    |   2 +-
 .../functional/GroupByReplicatedJUnitTest.java     |   2 +-
 .../cache/query/functional/GroupByTestImpl.java    |   2 +-
 .../query/functional/INOperatorJUnitTest.java      |   4 +-
 .../geode/cache/query/functional/IUMJUnitTest.java |   2 +-
 .../IUMRMultiIndexesMultiRegionJUnitTest.java      |   4 +-
 .../functional/IUMRSingleRegionJUnitTest.java      |  21 +-
 .../query/functional/IndexCreationJUnitTest.java   |  29 +-
 .../IndexMaintenanceAsynchJUnitTest.java           |   4 +-
 .../query/functional/IndexOnEntrySetJUnitTest.java |  19 +-
 .../IndexWithSngleFrmAndMultCondQryJUnitTest.java  |   2 +-
 .../functional/IteratorTypeDefEmpJUnitTest.java    |   3 +-
 .../query/functional/IteratorTypeDefJUnitTest.java |   3 +-
 .../query/functional/LikePredicateJUnitTest.java   |  28 +-
 .../query/functional/LimitClauseJUnitTest.java     |  68 +-
 .../cache/query/functional/MiscJUnitTest.java      |   1 -
 .../functional/MultiRegionIndexUsageJUnitTest.java |  23 +-
 .../query/functional/MultipleRegionsJUnitTest.java |   1 -
 .../functional/NegativeNumberQueriesJUnitTest.java |  17 +-
 .../query/functional/NestedQueryJUnitTest.java     |   1 -
 .../NonDistinctOrderByPartitionedJUnitTest.java    |   2 +-
 .../NonDistinctOrderByReplicatedJUnitTest.java     |   2 +-
 .../NonDistinctOrderByTestImplementation.java      |   9 +-
 .../query/functional/NumericQueryJUnitTest.java    |   4 +-
 .../functional/OrderByPartitionedJUnitTest.java    |   2 +-
 .../functional/OrderByTestImplementation.java      |   4 +-
 .../QueryREUpdateInProgressJUnitTest.java          |   2 +-
 .../query/functional/QueryUndefinedJUnitTest.java  |  23 +-
 .../functional/ReservedKeywordsJUnitTest.java      |   1 -
 .../query/functional/SelectToDateJUnitTest.java    |  25 +-
 .../CompiledAggregateFunctionJUnitTest.java        |   2 +-
 .../internal/CompiledGroupBySelectJUnitTest.java   |   2 +-
 .../CompiledJunctionInternalsJUnitTest.java        |  26 +-
 .../query/internal/CopyOnReadQueryJUnitTest.java   |   8 +-
 .../query/internal/ExecutionContextJUnitTest.java  |   6 +-
 .../cache/query/internal/QCompilerJUnitTest.java   |  10 +-
 .../QueryFromClauseCanonicalizationJUnitTest.java  |   4 +-
 .../internal/QueryObserverCallbackJUnitTest.java   |   4 +-
 .../cache/query/internal/QueryTraceJUnitTest.java  |  10 +-
 .../cache/query/internal/QueryUtilsJUnitTest.java  |  10 +-
 .../ResultsCollectionWrapperLimitJUnitTest.java    |   2 +-
 .../internal/SelectResultsComparatorJUnitTest.java |   2 +-
 .../internal/StructBagLimitBehaviourJUnitTest.java |   2 +-
 .../internal/cq/CqAttributesImplJUnitTest.java     |   6 +-
 .../AbstractIndexMaintenanceIntegrationTest.java   |   2 +-
 .../AsyncIndexUpdaterThreadShutdownJUnitTest.java  |  17 +-
 .../index/AsynchIndexMaintenanceJUnitTest.java     |   2 +-
 .../index/CompactRangeIndexIndexMapJUnitTest.java  |  21 +-
 ...ncurrentIndexInitOnOverflowRegionDUnitTest.java |  17 +-
 ...ntIndexOperationsOnOverflowRegionDUnitTest.java |  16 +-
 ...exUpdateWithInplaceObjectModFalseDUnitTest.java |   6 +-
 .../ConcurrentIndexUpdateWithoutWLDUnitTest.java   |   2 +-
 .../internal/index/CopyOnReadIndexDUnitTest.java   |   1 -
 .../internal/index/CopyOnReadIndexJUnitTest.java   |  28 +-
 .../index/HashIndexQueryIntegrationTest.java       | 124 +--
 .../internal/index/HashIndexSetJUnitTest.java      |   2 +-
 .../query/internal/index/IndexHintJUnitTest.java   |  19 +-
 .../internal/index/IndexMaintainceJUnitTest.java   |   2 +-
 .../internal/index/IndexMaintenanceJUnitTest.java  |   3 +-
 .../internal/index/IndexStatisticsJUnitTest.java   |  17 +-
 .../index/IndexTrackingQueryObserverDUnitTest.java |  16 +-
 .../index/IndexTrackingQueryObserverJUnitTest.java |  21 +-
 .../query/internal/index/IndexUseJUnitTest.java    |   2 +-
 .../index/MapRangeIndexMaintenanceJUnitTest.java   |  14 +-
 .../index/MultiIndexCreationDUnitTest.java         |  13 +-
 .../NewDeclarativeIndexCreationJUnitTest.java      |  19 +-
 ...ProgRegionCreationIndexUpdateTypeJUnitTest.java |  19 +-
 .../internal/index/RangeIndexAPIJUnitTest.java     |   2 +-
 .../cache/query/internal/types/TypeUtilTest.java   |   2 +-
 .../partitioned/PRBasicIndexCreationDUnitTest.java |  24 +-
 .../PRBasicIndexCreationDeadlockDUnitTest.java     |  22 +-
 .../PRBasicMultiIndexCreationDUnitTest.java        |  22 +-
 .../query/partitioned/PRBasicQueryDUnitTest.java   |  26 +-
 .../partitioned/PRColocatedEquiJoinDUnitTest.java  |  41 +-
 .../partitioned/PRIndexStatisticsJUnitTest.java    |  18 +-
 .../query/partitioned/PRInvalidQueryDUnitTest.java |  23 +-
 .../query/partitioned/PRInvalidQueryJUnitTest.java |   6 +-
 .../partitioned/PRQueryCacheCloseDUnitTest.java    |  26 +-
 .../partitioned/PRQueryCacheClosedJUnitTest.java   |  10 +-
 .../query/partitioned/PRQueryDUnitHelper.java      |  27 +-
 .../cache/query/partitioned/PRQueryDUnitTest.java  |  28 +-
 .../cache/query/partitioned/PRQueryJUnitTest.java  |   8 +-
 .../partitioned/PRQueryNumThreadsJUnitTest.java    |   8 +-
 .../partitioned/PRQueryRegionCloseDUnitTest.java   |  29 +-
 .../partitioned/PRQueryRegionClosedJUnitTest.java  |  10 +-
 .../PRQueryRegionDestroyedDUnitTest.java           |  27 +-
 .../PRQueryRegionDestroyedJUnitTest.java           |  10 +-
 .../PRQueryRemoteNodeExceptionDUnitTest.java       |   2 +-
 .../query/transaction/QueryAndJtaJUnitTest.java    |   2 +-
 .../cache/snapshot/CacheSnapshotJUnitTest.java     |   2 +-
 .../cache/snapshot/ParallelSnapshotDUnitTest.java  |  16 +-
 .../geode/cache/snapshot/RegionGenerator.java      |   1 +
 .../cache/snapshot/RegionSnapshotJUnitTest.java    |  25 +-
 .../geode/cache/snapshot/SnapshotDUnitTest.java    |  26 +-
 .../snapshot/SnapshotPerformanceDUnitTest.java     |  13 +-
 .../geode/cache/snapshot/SnapshotTestCase.java     |  19 +-
 .../geode/cache/snapshot/WanSnapshotJUnitTest.java |   2 +-
 .../apache/geode/cache/util/TxEventTestUtil.java   |  12 +-
 .../apache/geode/cache30/Bug38741DUnitTest.java    |   6 +-
 .../apache/geode/cache30/Bug40255JUnitTest.java    |  25 +-
 .../apache/geode/cache30/Bug40662JUnitTest.java    |  17 +-
 .../apache/geode/cache30/Bug44418JUnitTest.java    |  34 +-
 .../apache/geode/cache30/CacheCloseDUnitTest.java  |  13 +-
 .../geode/cache30/CacheListenerTestCase.java       |  11 +-
 .../apache/geode/cache30/CacheLoaderTestCase.java  |  11 +-
 .../geode/cache30/CacheStatisticsDUnitTest.java    |  11 +-
 .../apache/geode/cache30/CacheWriterTestCase.java  |  13 +-
 .../geode/cache30/CacheXMLPartitionResolver.java   |   4 +-
 .../apache/geode/cache30/CacheXml66DUnitTest.java  |  16 +-
 .../apache/geode/cache30/CacheXml70DUnitTest.java  |   6 +-
 .../apache/geode/cache30/CacheXml81DUnitTest.java  |   6 +-
 .../org/apache/geode/cache30/CacheXmlTestCase.java |   2 +-
 .../geode/cache30/CachedAllEventsDUnitTest.java    |   7 +-
 .../apache/geode/cache30/CallbackArgDUnitTest.java |  13 +-
 .../cache30/CertifiableTestCacheListener.java      |  12 +-
 .../geode/cache30/ClientMembershipDUnitTest.java   |   6 +-
 .../cache30/ClientMembershipSelectorDUnitTest.java |   2 +-
 .../cache30/ClientRegisterInterestDUnitTest.java   |   3 +-
 .../ClientRegisterInterestSelectorDUnitTest.java   |   2 +-
 .../geode/cache30/ClientServerCCEDUnitTest.java    |  40 +-
 .../apache/geode/cache30/ClientServerTestCase.java |   3 +-
 .../cache30/ConcurrentLeaveDuringGIIDUnitTest.java |  19 +-
 ...stributedNoAckAsyncOverflowRegionDUnitTest.java |  15 +-
 .../DiskDistributedNoAckAsyncRegionDUnitTest.java  |  14 +-
 .../apache/geode/cache30/DiskRegionDUnitTest.java  |  13 +-
 .../DistributedAckOverflowRegionCCEDUnitTest.java  |  11 +-
 ...ibutedAckOverflowRegionCCEOffHeapDUnitTest.java |   2 +-
 ...DistributedAckPersistentRegionCCEDUnitTest.java |   2 +-
 ...utedAckPersistentRegionCCEOffHeapDUnitTest.java |   2 +-
 .../cache30/DistributedAckRegionCCEDUnitTest.java  |   2 +-
 .../DistributedAckRegionCCEOffHeapDUnitTest.java   |   2 +-
 .../DistributedAckRegionCompressionDUnitTest.java  |   2 +-
 .../DistributedAckRegionOffHeapDUnitTest.java      |   2 +-
 .../DistributedMulticastRegionDUnitTest.java       |   2 +-
 .../DistributedNoAckRegionCCEOffHeapDUnitTest.java |   2 +-
 .../DistributedNoAckRegionOffHeapDUnitTest.java    |   2 +-
 .../geode/cache30/DynamicRegionDUnitTest.java      |  13 +-
 .../geode/cache30/GlobalLockingDUnitTest.java      |  15 +-
 .../geode/cache30/GlobalRegionCCEDUnitTest.java    |   2 +-
 .../cache30/GlobalRegionCCEOffHeapDUnitTest.java   |  11 +-
 .../cache30/GlobalRegionOffHeapDUnitTest.java      |   2 +-
 .../cache30/LRUEvictionControllerDUnitTest.java    |  15 +-
 .../cache30/MemLRUEvictionControllerDUnitTest.java |  23 +-
 .../geode/cache30/MultiVMRegionTestCase.java       |  10 +-
 .../geode/cache30/MyGatewayEventFilter2.java       |   2 +-
 .../geode/cache30/MyGatewayTransportFilter1.java   |   1 -
 .../OffHeapLRUEvictionControllerDUnitTest.java     |   2 +-
 .../cache30/PRBucketSynchronizationDUnitTest.java  |  17 +-
 .../PartitionedRegionCompressionDUnitTest.java     |  13 +-
 .../geode/cache30/PartitionedRegionDUnitTest.java  |   3 +-
 ...rtitionedRegionMembershipListenerDUnitTest.java |  13 +-
 .../cache30/PartitionedRegionOffHeapDUnitTest.java |   2 +-
 .../org/apache/geode/cache30/ProxyDUnitTest.java   |  13 +-
 .../geode/cache30/RRSynchronizationDUnitTest.java  |  15 +-
 .../apache/geode/cache30/ReconnectDUnitTest.java   |  34 +-
 .../cache30/ReconnectWithCacheXMLDUnitTest.java    |  13 +-
 .../cache30/ReconnectWithUDPSecurityDUnitTest.java |   7 +-
 .../geode/cache30/RegionAttributesTestCase.java    |  21 +-
 .../geode/cache30/RegionExpirationDUnitTest.java   |  11 +-
 .../cache30/RegionMembershipListenerDUnitTest.java |  15 +-
 .../cache30/RegionReliabilityDistAckDUnitTest.java |  10 +-
 .../RegionReliabilityDistNoAckDUnitTest.java       |  10 +-
 .../cache30/RegionReliabilityGlobalDUnitTest.java  |  10 +-
 .../RegionReliabilityListenerDUnitTest.java        |   1 -
 .../geode/cache30/RegionReliabilityTestCase.java   |   1 -
 .../org/apache/geode/cache30/RegionTestCase.java   |  84 +-
 .../geode/cache30/RequiredRolesDUnitTest.java      |   3 +-
 .../geode/cache30/SearchAndLoadDUnitTest.java      |   8 +-
 .../org/apache/geode/cache30/SlowRecDUnitTest.java |  23 +-
 .../geode/cache30/TXDistributedDUnitTest.java      |   5 +-
 .../org/apache/geode/cache30/TXOrderDUnitTest.java |   1 +
 .../geode/cache30/TXRestrictionsDUnitTest.java     |   2 +-
 .../apache/geode/cache30/TestCacheCallback.java    |   2 +-
 .../apache/geode/cache30/TestCacheListener.java    |   9 +-
 .../org/apache/geode/cache30/TestCacheWriter.java  |   1 -
 .../java/org/apache/geode/cache30/TestHeapLRU.java |   2 +-
 .../AnalyzeSerializablesJUnitTest.java             |  21 +-
 .../apache/geode/codeAnalysis/ClassAndMethods.java |   6 +-
 .../codeAnalysis/ClassAndVariableDetails.java      |   2 +-
 .../geode/codeAnalysis/CompiledClassUtils.java     |   6 +-
 .../AbstractLauncherServiceStateTest.java          |   2 +-
 .../distributed/DistributedLockBlackboardImpl.java |   6 +-
 .../DistributedLockServiceDUnitTest.java           |  13 +-
 .../distributed/DistributedMemberDUnitTest.java    |  29 +-
 .../distributed/DistributedSystemDUnitTest.java    |  12 +-
 .../DistributedSystemIntegrationJUnitTest.java     |   2 +-
 .../distributed/DistributedSystemJUnitTest.java    |   2 +-
 .../geode/distributed/HostedLocatorsDUnitTest.java |  31 +-
 .../LauncherMemberMXBeanIntegrationTest.java       |   2 +-
 .../apache/geode/distributed/LocatorDUnitTest.java |  31 +-
 .../apache/geode/distributed/LocatorJUnitTest.java |  44 +-
 .../distributed/LocatorUDPSecurityDUnitTest.java   |  13 +-
 .../apache/geode/distributed/RoleDUnitTest.java    |   3 +-
 .../ServerLauncherRemoteFileIntegrationTest.java   |   2 +-
 .../distributed/internal/Bug40751DUnitTest.java    |   2 +-
 .../ConsoleDistributionManagerDUnitTest.java       |   6 +-
 .../geode/distributed/internal/DateMessage.java    |   8 +-
 .../DefaultPropertiesGeneratorIntegrationTest.java |  14 +-
 .../internal/DistributionAdvisorDUnitTest.java     |   2 +-
 .../internal/DistributionAdvisorTest.java          |   3 +-
 .../internal/DistributionManagerDUnitTest.java     |   7 +-
 .../internal/DistributionManagerTest.java          |   7 +-
 .../internal/DistributionMessageTest.java          |   3 +-
 .../InternalDistributedSystemJUnitTest.java        |  12 +-
 .../internal/InternalLocatorIntegrationTest.java   |  13 +-
 .../LocatorLoadSnapshotIntegrationTest.java        |   2 +-
 .../distributed/internal/ProduceDateMessages.java  |   6 +-
 .../internal/ProductUseLogDUnitTest.java           |   4 +-
 .../internal/ProductUseLogJUnitTest.java           |   2 +-
 .../distributed/internal/ReplyProcessor21Test.java |   3 +-
 .../internal/ServerLocatorJUnitTest.java           |   4 +-
 .../internal/StartupMessageDataJUnitTest.java      |   6 +-
 .../deadlock/GemFireDeadlockDetectorDUnitTest.java |  25 +-
 .../internal/locks/DLockGrantorHelper.java         |   1 -
 .../locks/DLockReentrantLockJUnitTest.java         |  17 +-
 .../locks/DLockServiceCharacterizationTests.java   |  13 +-
 .../internal/locks/DLockServiceLeakTest.java       |  27 +-
 .../internal/membership/InternalRoleJUnitTest.java |   4 +-
 .../internal/membership/MembershipJUnitTest.java   |  15 +-
 .../internal/membership/NetViewJUnitTest.java      |   2 +-
 .../membership/gms/GMSMemberJUnitTest.java         |   8 +-
 .../membership/gms/MembershipManagerHelper.java    |   4 +-
 .../gms/auth/AbstractGMSAuthenticatorTestCase.java |  17 +-
 .../GMSAuthenticatorWithSecurityManagerTest.java   |   1 -
 .../gms/fd/GMSHealthMonitorJUnitTest.java          |  60 +-
 .../gms/locator/GMSLocatorRecoveryJUnitTest.java   |  22 +-
 .../gms/membership/GMSJoinLeaveJUnitTest.java      |  48 +-
 .../gms/membership/StatRecorderJUnitTest.java      |  39 +-
 .../gms/messenger/GMSEncryptJUnitTest.java         |  32 +-
 .../gms/messenger/GMSQuorumCheckerJUnitTest.java   |   4 +-
 .../gms/messenger/JGroupsMessengerJUnitTest.java   |  59 +-
 .../internal/tcpserver/TCPServerSSLJUnitTest.java  |  29 +-
 .../TcpServerBackwardCompatDUnitTest.java          |   4 +-
 .../internal/tcpserver/TcpServerJUnitTest.java     |  31 +-
 .../geode/disttx/CacheMapDistTXDUnitTest.java      |  10 +-
 .../apache/geode/disttx/DistTXDebugDUnitTest.java  |   8 +-
 .../apache/geode/disttx/DistTXExpiryJUnitTest.java |  13 +-
 .../geode/disttx/DistTXManagerImplJUnitTest.java   |   2 +-
 .../DistTXReleasesOffHeapOnCloseJUnitTest.java     |  13 +-
 .../geode/internal/AbstractConfigJUnitTest.java    |  13 +-
 .../apache/geode/internal/AbstractConfigTest.java  |   3 +-
 .../org/apache/geode/internal/AssertJUnitTest.java |   3 +-
 .../apache/geode/internal/AvailablePortHelper.java |   3 +-
 .../geode/internal/AvailablePortJUnitTest.java     |  17 +-
 ...ackwardCompatibilitySerializationDUnitTest.java |  27 +-
 .../apache/geode/internal/Bug51616JUnitTest.java   |  13 +-
 .../org/apache/geode/internal/ByteArrayData.java   |   2 +-
 .../internal/ClassNotFoundExceptionDUnitTest.java  |  13 +-
 .../internal/ClassPathLoaderIntegrationTest.java   |   4 +-
 .../apache/geode/internal/ClassPathLoaderTest.java |   4 +-
 .../geode/internal/DataSerializableJUnitTest.java  |   2 +-
 .../geode/internal/DeployedJarJUnitTest.java       |   8 +-
 .../geode/internal/GemFireVersionJUnitTest.java    |  23 +-
 .../internal/HeapDataOutputStreamJUnitTest.java    |   2 +-
 .../geode/internal/HeapDataOutputStreamTest.java   |   3 +-
 .../apache/geode/internal/InlineKeyJUnitTest.java  |  21 +-
 ...InternalDataSerializerQuickcheckStringTest.java |  15 +-
 .../geode/internal/ObjIdConcurrentMapTest.java     |   5 +-
 .../geode/internal/PdxDeleteFieldDUnitTest.java    |  21 +-
 .../geode/internal/PdxDeleteFieldJUnitTest.java    |  13 +-
 .../apache/geode/internal/PdxRenameDUnitTest.java  |  21 +-
 .../apache/geode/internal/PdxRenameJUnitTest.java  |  15 +-
 ...qualityShouldUseArrayEqualsIntegrationTest.java |  17 +-
 .../internal/SSLConfigIntegrationJUnitTest.java    |  13 +-
 ...edThreadPoolExecutorWithKeepAliveJUnitTest.java |   2 +-
 .../geode/internal/UniqueIdGeneratorJUnitTest.java |   2 +-
 .../remote/DistributionLocatorIdJUnitTest.java     |   4 +-
 .../internal/cache/AbstractDiskRegionTest.java     |   3 +-
 .../internal/cache/AbstractLRURegionMapTest.java   |   3 +-
 .../cache/AbstractOplogDiskRegionEntryTest.java    |   5 +-
 .../internal/cache/AbstractRegionJUnitTest.java    |   2 +-
 .../internal/cache/AbstractRegionMapTest.java      |   5 +-
 .../geode/internal/cache/AbstractRegionTest.java   |   3 +-
 .../geode/internal/cache/BackupDUnitTest.java      |  48 +-
 .../geode/internal/cache/BackupJUnitTest.java      |  36 +-
 .../geode/internal/cache/BucketAdvisorTest.java    |   5 +-
 .../cache/BucketPersistenceAdvisorTest.java        |   8 +-
 .../cache/BucketRedundancyTrackerTest.java         |   3 +-
 .../internal/cache/BucketRegionJUnitTest.java      |   3 +-
 .../internal/cache/BucketRegionQueueHelper.java    |   6 +-
 .../geode/internal/cache/Bug33726JUnitTest.java    |  17 +-
 .../cache/Bug34179TooManyFilesOpenJUnitTest.java   |   6 +-
 .../geode/internal/cache/Bug34583JUnitTest.java    |  21 +-
 .../geode/internal/cache/Bug37241DUnitTest.java    |   2 -
 .../geode/internal/cache/Bug37244JUnitTest.java    |  39 +-
 .../geode/internal/cache/Bug37377DUnitTest.java    |  22 +-
 .../geode/internal/cache/Bug37500JUnitTest.java    |  15 +-
 .../geode/internal/cache/Bug39079DUnitTest.java    |   2 +-
 .../geode/internal/cache/Bug40299DUnitTest.java    |  14 +-
 .../geode/internal/cache/Bug41957DUnitTest.java    |   3 +-
 .../geode/internal/cache/Bug42055DUnitTest.java    |  11 +-
 .../geode/internal/cache/Bug45164DUnitTest.java    |  13 +-
 .../geode/internal/cache/Bug47667DUnitTest.java    |  11 +-
 .../internal/cache/CacheAdvisorDUnitTest.java      |  19 +-
 .../internal/cache/CacheOperationMessageTest.java  |   5 +-
 .../cache/CacheServerLauncherJUnitTest.java        |   4 +-
 .../internal/cache/CacheServiceJUnitTest.java      |   9 +-
 .../geode/internal/cache/ClearGlobalDUnitTest.java |   2 +-
 .../internal/cache/ClearRvvLockingDUnitTest.java   |  17 +-
 .../internal/cache/ClearTXLockingDUnitTest.java    |  18 +-
 ...tMessagesRegionCreationAndDestroyJUnitTest.java |  35 +-
 .../cache/ClientServerGetAllDUnitTest.java         |   3 +-
 ...entServerInvalidAndDestroyedEntryDUnitTest.java |   2 +-
 .../cache/ClientServerTransactionCCEDUnitTest.java |  15 +-
 .../cache/ClientServerTransactionDUnitTest.java    |  28 +-
 .../geode/internal/cache/ColocatedPRJUnitTest.java |   2 +-
 .../geode/internal/cache/ColocationHelperTest.java |   4 +-
 .../geode/internal/cache/CommitFunction.java       |  14 +-
 .../internal/cache/ComplexDiskRegionJUnitTest.java |   4 +-
 .../cache/ConcurrentDestroySubRegionDUnitTest.java |  11 +-
 ...urrentFlushingAndRegionOperationsJUnitTest.java |  18 +-
 .../internal/cache/ConcurrentMapOpsDUnitTest.java  |   2 +-
 .../cache/ConcurrentRegionOperationsJUnitTest.java |   6 +-
 ...currentRollingAndRegionOperationsJUnitTest.java |   2 +-
 .../geode/internal/cache/ConflationJUnitTest.java  |   8 +-
 .../internal/cache/ConnectDisconnectDUnitTest.java |  21 +-
 .../cache/CustomerIDPartitionResolver.java         |   8 +-
 .../internal/cache/DeltaFaultInDUnitTest.java      |  11 +-
 .../cache/DeltaPropagationStatsDUnitTest.java      |  20 +-
 .../geode/internal/cache/DeltaSizingDUnitTest.java |  13 +-
 ...stroyEntryWithConcurrentOperationJUnitTest.java |  23 +-
 .../geode/internal/cache/DestroyMessageTest.java   |   5 +-
 .../geode/internal/cache/DiskIFJUnitTest.java      |   4 +-
 .../cache/DiskLruRegRecoveryJUnitTest.java         |   2 +-
 .../geode/internal/cache/DiskOldAPIsJUnitTest.java |   7 +-
 .../DiskRandomOperationsAndRecoveryJUnitTest.java  |  18 +-
 .../internal/cache/DiskRegByteArrayDUnitTest.java  |  20 +-
 .../internal/cache/DiskRegCacheXmlJUnitTest.java   |   4 +-
 .../DiskRegOplogSwtchingAndRollerJUnitTest.java    |   2 +-
 .../internal/cache/DiskRegRecoveryJUnitTest.java   |   3 +-
 .../cache/DiskRegionAsyncRecoveryJUnitTest.java    |  17 +-
 ...iskRegionChangingRegionAttributesJUnitTest.java |   2 +-
 .../internal/cache/DiskRegionClearJUnitTest.java   |   2 +-
 .../internal/cache/DiskRegionHelperFactory.java    |   6 +-
 .../geode/internal/cache/DiskRegionJUnitTest.java  |  29 +-
 .../geode/internal/cache/DiskRegionProperties.java |   6 +-
 .../internal/cache/DiskRegionTestingBase.java      |  27 +-
 .../internal/cache/DistPeerTXStateStubTest.java    |   7 +-
 .../cache/DistributedCacheOperationTest.java       |  11 +-
 .../cache/DistributedPutAllOperationTest.java      |   3 +-
 ...tributedRegionFunctionStreamingMessageTest.java |   5 +-
 .../internal/cache/DistributedRegionJUnitTest.java |   2 +-
 .../DistributedRegionSearchLoadJUnitTest.java      |   2 +-
 .../internal/cache/DistributedRegionTest.java      |   3 +-
 .../cache/DistributedRemoveAllOperationTest.java   |   3 +-
 .../geode/internal/cache/EvictionDUnitTest.java    |   2 +-
 .../cache/EvictionObjectSizerDUnitTest.java        |  15 +-
 .../internal/cache/EvictionStatsDUnitTest.java     |  17 +-
 .../geode/internal/cache/EvictionTestBase.java     |   2 +-
 .../geode/internal/cache/ExpiryTaskTest.java       |   3 +-
 ...FireAndForgetFunctionOnAllServersDUnitTest.java |  11 +-
 .../internal/cache/FixedPRSinglehopDUnitTest.java  |   4 +-
 .../geode/internal/cache/GIIDeltaDUnitTest.java    |  33 +-
 .../internal/cache/GIIFlowControlDUnitTest.java    |  17 +-
 .../geode/internal/cache/GemFireCacheImplTest.java |   2 +-
 .../geode/internal/cache/GridProfileTest.java      |  11 +-
 .../cache/HAOverflowMemObjectSizerDUnitTest.java   |   4 +-
 .../internal/cache/IncrementalBackupDUnitTest.java |  36 +-
 .../cache/InterruptClientServerDUnitTest.java      |  17 +-
 .../internal/cache/InterruptDiskJUnitTest.java     |  29 +-
 .../geode/internal/cache/InterruptsDUnitTest.java  |  14 +-
 .../geode/internal/cache/IteratorDUnitTest.java    |  19 +-
 .../LIFOEvictionAlgoEnabledRegionJUnitTest.java    |  26 +-
 ...FOEvictionAlgoMemoryEnabledRegionJUnitTest.java |  32 +-
 .../geode/internal/cache/MapClearGIIDUnitTest.java |   5 +-
 .../internal/cache/MapInterface2JUnitTest.java     |   6 +-
 .../cache/MemberFunctionStreamingMessageTest.java  |   5 +-
 .../MultipleOplogsRollingFeatureJUnitTest.java     |   3 +-
 .../internal/cache/NestedTransactionFunction.java  |   8 +-
 .../cache/NetSearchMessagingDUnitTest.java         |   5 +-
 .../internal/cache/NonLocalRegionEntryTest.java    |   3 +-
 .../internal/cache/OffHeapEvictionDUnitTest.java   |   2 +-
 .../geode/internal/cache/OffHeapTestUtil.java      |   3 +-
 .../geode/internal/cache/OplogJUnitTest.java       |   8 +-
 .../geode/internal/cache/OplogRVVJUnitTest.java    |  31 +-
 .../cache/P2PDeltaPropagationDUnitTest.java        |   1 -
 .../geode/internal/cache/PRBadToDataDUnitTest.java |  17 +-
 .../cache/PRConcurrentMapOpsJUnitTest.java         |  15 +-
 .../cache/PRDataStoreMemoryOffHeapJUnitTest.java   |  11 +-
 .../internal/cache/PartitionListenerDUnitTest.java |  13 +-
 .../cache/PartitionedRegionAPIDUnitTest.java       |  24 +-
 .../PartitionedRegionAsSubRegionDUnitTest.java     |  27 +-
 ...dRegionBucketCreationDistributionDUnitTest.java |  16 +-
 .../PartitionedRegionCacheCloseDUnitTest.java      |  23 +-
 .../PartitionedRegionCacheLoaderForRootRegion.java |   2 +-
 .../PartitionedRegionCacheLoaderForSubRegion.java  |   4 +-
 .../cache/PartitionedRegionCreationDUnitTest.java  |  29 +-
 .../cache/PartitionedRegionCreationJUnitTest.java  |  18 +-
 .../cache/PartitionedRegionDUnitTestCase.java      |  10 +-
 .../cache/PartitionedRegionDataStoreJUnitTest.java |  23 +-
 .../PartitionedRegionDelayedRecoveryDUnitTest.java |  11 +-
 .../cache/PartitionedRegionDestroyDUnitTest.java   |  21 +-
 .../PartitionedRegionEntryCountDUnitTest.java      |  15 +-
 .../cache/PartitionedRegionEvictionDUnitTest.java  |   4 +-
 .../cache/PartitionedRegionHADUnitTest.java        |  27 +-
 .../PartitionedRegionInvalidateDUnitTest.java      |  13 +-
 .../PartitionedRegionLocalMaxMemoryDUnitTest.java  |   2 +-
 ...tionedRegionLocalMaxMemoryOffHeapDUnitTest.java |   2 +-
 .../cache/PartitionedRegionMultipleDUnitTest.java  |  15 +-
 .../cache/PartitionedRegionPRIDDUnitTest.java      |  24 +-
 .../cache/PartitionedRegionQueryDUnitTest.java     |  33 +-
 ...itionedRegionQueryEvaluatorIntegrationTest.java |  10 +-
 .../PartitionedRegionRedundancyTrackerTest.java    |   3 +-
 ...rtitionedRegionSerializableObjectJUnitTest.java |   2 +-
 .../cache/PartitionedRegionSingleHopDUnitTest.java |   2 +-
 ...nedRegionSingleHopWithServerGroupDUnitTest.java |   4 +-
 ...itionedRegionSingleNodeOperationsJUnitTest.java |  52 +-
 .../cache/PartitionedRegionSizeDUnitTest.java      |  33 +-
 .../cache/PartitionedRegionStatsDUnitTest.java     |  27 +-
 .../cache/PartitionedRegionStatsJUnitTest.java     |  31 +-
 .../cache/PartitionedRegionTestHelper.java         |  31 +-
 .../cache/PartitionedRegionTestUtilsDUnitTest.java |   4 +-
 .../PartitionedRegionWithSameNameDUnitTest.java    |  23 +-
 .../PersistentPartitionedRegionJUnitTest.java      |  17 +-
 .../internal/cache/PlaceHolderDiskRegionTest.java  |   3 +-
 .../internal/cache/ProxyBucketRegionTest.java      |   3 +-
 .../internal/cache/RegionEntryFlagsJUnitTest.java  |   2 +-
 .../internal/cache/RegionListenerJUnitTest.java    |  15 +-
 .../cache/RemoteFetchEntryMessageTest.java         |   5 +-
 .../internal/cache/RemotePutAllMessageTest.java    |   5 +-
 .../internal/cache/RemoteRemoveAllMessageTest.java |   5 +-
 .../cache/RemoteTransactionCCEDUnitTest.java       |   6 +-
 .../internal/cache/RemoteTransactionDUnitTest.java |   5 +-
 .../geode/internal/cache/RemoveDAckDUnitTest.java  |   2 -
 .../cache/ReplaceWithOverflowJUnitTest.java        |   3 +-
 .../ReplicateCacheListenerInvocationTest.java      |   2 +-
 .../cache/RequestFilterInfoMessageTest.java        |   5 +-
 .../internal/cache/RequestImageMessageTest.java    |   5 +-
 .../internal/cache/RequestRVVMessageTest.java      |   5 +-
 .../geode/internal/cache/RollbackFunction.java     |  14 +-
 .../cache/SearchLoadAndWriteProcessorTest.java     |   3 +-
 .../internal/cache/SimpleDiskRegionJUnitTest.java  |   4 +-
 .../internal/cache/SingleHopStatsDUnitTest.java    |  15 +-
 .../geode/internal/cache/SizingFlagDUnitTest.java  |  19 +-
 .../geode/internal/cache/SnapshotTestUtil.java     |   4 +-
 .../internal/cache/StateMarkerMessageTest.java     |   5 +-
 .../internal/cache/SystemFailureDUnitTest.java     |  54 +-
 .../apache/geode/internal/cache/TXEventTest.java   |   5 +-
 .../internal/cache/TXManagerImplJUnitTest.java     |  26 +-
 .../geode/internal/cache/TXManagerImplTest.java    |   2 +-
 .../apache/geode/internal/cache/TXMessageTest.java |   5 +-
 .../internal/cache/TXReservationMgrJUnitTest.java  |  23 +-
 .../internal/cache/TXStateProxyImplJUnitTest.java  |   1 +
 .../geode/internal/cache/TXStateStubTest.java      |   5 +-
 .../geode/internal/cache/TestNonSizerObject.java   |   4 +-
 .../geode/internal/cache/TestObjectSizerImpl.java  |   4 +-
 .../internal/cache/TombstoneCreationJUnitTest.java |  23 +-
 .../cache/TransactionsWithDeltaDUnitTest.java      |  26 +-
 .../internal/cache/UpdateVersionJUnitTest.java     |  17 +-
 .../apache/geode/internal/cache/VLJUnitTest.java   |   2 +-
 .../cache/control/MemoryMonitorJUnitTest.java      |   9 +-
 .../control/MemoryMonitorOffHeapJUnitTest.java     |  30 +-
 .../cache/control/RebalanceOperationDUnitTest.java |  24 +-
 .../cache/control/ResourceAdvisorTest.java         |   5 +-
 .../cache/control/TestMemoryThresholdListener.java |   4 +-
 ...skRegionOverflowAsyncRollingOpLogJUnitTest.java |   2 +-
 ...iskRegionOverflowSyncRollingOpLogJUnitTest.java |  10 +-
 .../DiskRegionPersistOnlySyncJUnitTest.java        |   3 +-
 .../MultiThreadedOplogPerJUnitPerformanceTest.java |  25 +-
 .../cache/event/DistributedEventTrackerTest.java   |   1 +
 .../ClientServerFunctionExecutionDUnitTest.java    |  17 +-
 .../cache/execute/CustomResultCollector.java       |   2 +-
 .../cache/execute/CustomerIDPartitionResolver.java |   6 +-
 ...istributedRegionFunctionExecutionDUnitTest.java |   6 +-
 .../FunctionExecution_ExceptionDUnitTest.java      |  15 +-
 .../FunctionServiceClientAccessorPRBase.java       |   8 +-
 .../FunctionServiceClientAccessorPRDUnitTest.java  |   3 +-
 ...ceClientAccessorPRMultipleMembersDUnitTest.java |   3 +-
 ...AccessorPRMultipleMembersMultihopDUnitTest.java |   5 +-
 ...tionServiceClientMultipleOnServerDUnitTest.java |   3 +-
 .../execute/FunctionServiceClientOnServerBase.java |   4 +-
 .../FunctionServiceClientOnServerDUnitTest.java    |   4 +-
 .../execute/FunctionServiceLocalPRDUnitTest.java   |   6 +-
 .../execute/FunctionServiceLocalRRDUnitTest.java   |   6 +-
 .../FunctionServiceMultipleOnMemberDUnitTest.java  |   6 +-
 .../execute/FunctionServicePeerAccessorPRBase.java |   6 +-
 .../FunctionServicePeerAccessorPRDUnitTest.java    |   8 +-
 ...vicePeerAccessorPRMultipleMembersDUnitTest.java |   8 +-
 .../FunctionServicePeerAccessorRRDUnitTest.java    |   6 +-
 .../execute/FunctionServiceStatsDUnitTest.java     |  10 +-
 .../execute/LocalDataSetIndexingDUnitTest.java     |  25 +-
 .../execute/MemberFunctionExecutionDUnitTest.java  |  16 +-
 .../MultiRegionFunctionExecutionDUnitTest.java     |  13 +-
 .../execute/MyFunctionExecutionException.java      |   8 +-
 ...lientServerFunctionExecutionNoAckDUnitTest.java |  17 +-
 ...ientServerRegionFunctionExecutionDUnitTest.java |   2 +-
 ...erRegionFunctionExecutionFailoverDUnitTest.java |   2 +-
 ...egionFunctionExecutionNoSingleHopDUnitTest.java |  13 +-
 ...ctionExecutionSelectorNoSingleHopDUnitTest.java |  35 +-
 ...rRegionFunctionExecutionSingleHopDUnitTest.java |  16 +-
 .../cache/execute/PRColocationDUnitTest.java       |  18 +-
 .../execute/PRCustomPartitioningDUnitTest.java     |  35 +-
 .../execute/PRFunctionExecutionDUnitTest.java      |   1 -
 ...FunctionExecutionWithResultSenderDUnitTest.java |  27 +-
 .../cache/execute/PRPerformanceTestDUnitTest.java  |  22 +-
 .../cache/execute/PRSetOperationJTADUnitTest.java  |  18 +-
 .../cache/execute/PRSetOperationTXDUnitTest.java   |  18 +-
 .../cache/execute/PRTransaction2DUnitTest.java     |   7 +-
 .../cache/execute/PRTransactionDUnitTest.java      |  28 +-
 .../PRTransactionWithVersionsDUnitTest.java        |   6 +-
 .../cache/execute/PerformanceTestFunction.java     |   4 +-
 .../execute/SingleHopGetAllPutAllDUnitTest.java    |  12 +-
 .../geode/internal/cache/execute/TestFunction.java |   4 +-
 .../geode/internal/cache/execute/data/CustId.java  |   8 +-
 .../internal/cache/execute/data/Customer.java      |  10 +-
 .../geode/internal/cache/execute/data/Order.java   |  10 +-
 .../geode/internal/cache/execute/data/OrderId.java |   8 +-
 .../internal/cache/execute/data/Shipment.java      |  10 +-
 .../internal/cache/execute/data/ShipmentId.java    |   8 +-
 .../ExtensionClusterConfigurationDUnitTest.java    |  13 +-
 .../extension/SimpleExtensionPointJUnitTest.java   |   4 +-
 .../extension/mock/AbstractMockExtension.java      |   2 +-
 .../mock/AbstractMockExtensionXmlGenerator.java    |   2 +-
 .../mock/AlterMockCacheExtensionFunction.java      |   2 +-
 .../mock/AlterMockRegionExtensionFunction.java     |   4 +-
 .../mock/CreateMockCacheExtensionFunction.java     |   2 +-
 .../mock/CreateMockRegionExtensionFunction.java    |   4 +-
 .../mock/DestroyMockCacheExtensionFunction.java    |   2 +-
 .../mock/DestroyMockRegionExtensionFunction.java   |   4 +-
 .../cache/extension/mock/MockCacheExtension.java   |   4 +-
 .../mock/MockCacheExtensionXmlGenerator.java       |   2 +-
 .../extension/mock/MockExtensionCommands.java      |  14 +-
 .../extension/mock/MockExtensionXmlParser.java     |   2 +-
 .../cache/extension/mock/MockRegionExtension.java  |   2 +-
 .../mock/MockRegionExtensionXmlGenerator.java      |   2 +-
 .../internal/cache/functions/TestFunction.java     |  28 +-
 .../ha/BlockingHARQAddOperationJUnitTest.java      |  24 +-
 .../cache/ha/BlockingHARQStatsJUnitTest.java       |  10 +-
 .../cache/ha/BlockingHARegionJUnitTest.java        |   4 +-
 .../cache/ha/Bug36853EventsExpiryDUnitTest.java    |  14 +-
 .../geode/internal/cache/ha/Bug48571DUnitTest.java |  18 +-
 .../geode/internal/cache/ha/Bug48879DUnitTest.java |   3 +-
 .../geode/internal/cache/ha/ConflatableObject.java |  18 +-
 .../cache/ha/EventIdOptimizationDUnitTest.java     |  35 +-
 .../cache/ha/EventIdOptimizationJUnitTest.java     |   5 +-
 .../geode/internal/cache/ha/FailoverDUnitTest.java |   2 +-
 .../internal/cache/ha/HABugInPutDUnitTest.java     |   6 +-
 .../geode/internal/cache/ha/HAClearDUnitTest.java  |   2 +-
 .../internal/cache/ha/HAConflationDUnitTest.java   |  10 +-
 .../internal/cache/ha/HADuplicateDUnitTest.java    |   2 +-
 .../cache/ha/HAEventIdPropagationDUnitTest.java    |  12 +-
 .../geode/internal/cache/ha/HAExpiryDUnitTest.java |   8 +-
 .../geode/internal/cache/ha/HAGIIBugDUnitTest.java |   8 +-
 .../geode/internal/cache/ha/HAGIIDUnitTest.java    |   2 +-
 .../cache/ha/HARQAddOperationJUnitTest.java        |  16 +-
 .../cache/ha/HARQueueNewImplDUnitTest.java         |   4 +-
 .../geode/internal/cache/ha/HARegionDUnitTest.java |  40 +-
 .../geode/internal/cache/ha/HARegionJUnitTest.java |   2 +-
 .../internal/cache/ha/HARegionQueueDUnitTest.java  |   4 +-
 .../internal/cache/ha/HARegionQueueJUnitTest.java  |  32 +-
 .../cache/ha/HARegionQueueStatsJUnitTest.java      |  53 +-
 .../internal/cache/ha/HASlowReceiverDUnitTest.java |   4 +-
 .../cache/ha/OperationsPropagationDUnitTest.java   |   2 +-
 .../ha/PreferSerializedHARegionQueueTest.java      |  15 +-
 .../geode/internal/cache/ha/PutAllDUnitTest.java   |  34 +-
 .../geode/internal/cache/ha/StatsBugDUnitTest.java |  20 +-
 .../cache/ha/TestBlockingHARegionQueue.java        |  12 +-
 .../cache/ha/ThreadIdentifierJUnitTest.java        |   8 +-
 .../cache/locks/TXLockServiceDUnitTest.java        |  28 +-
 .../geode/internal/cache/lru/LRUAlgorithmTest.java |   3 +-
 .../internal/cache/lru/LRUClockJUnitTest.java      |   3 +-
 .../cache/lru/TransactionsWithOverflowTest.java    |  15 +-
 .../cache/partitioned/BucketBackupMessageTest.java |   3 +-
 .../BucketRebalanceStatRegressionTest.java         |  32 +-
 .../cache/partitioned/Bug47388DUnitTest.java       |   2 +-
 .../cache/partitioned/Bug51400DUnitTest.java       |   2 +-
 .../ColocatedRegionDetailsJUnitTest.java           |   9 +-
 .../DeposePrimaryBucketMessageTest.java            |   5 +-
 .../cache/partitioned/ElidedPutAllDUnitTest.java   |  13 +-
 .../cache/partitioned/FetchEntryMessageTest.java   |   5 +-
 .../FetchPartitionDetailsMessageTest.java          |   5 +-
 .../cache/partitioned/MoveBucketMessageTest.java   |   5 +-
 .../partitioned/PartitionResolverDUnitTest.java    |  31 +-
 .../PartitionedRegionLoadModelJUnitTest.java       |  14 +-
 .../PartitionedRegionLoaderWriterDUnitTest.java    |  13 +-
 .../PartitionedRegionMetaDataCleanupDUnitTest.java |  15 +-
 .../cache/partitioned/PersistPRKRFDUnitTest.java   |  17 +-
 ...sistentColocatedPartitionedRegionDUnitTest.java |  63 +-
 .../PersistentPartitionedRegionDUnitTest.java      |  25 +-
 ...sistentPartitionedRegionOldConfigDUnitTest.java |  11 +-
 .../PersistentPartitionedRegionTestBase.java       |  27 +-
 ...tPartitionedRegionWithTransactionDUnitTest.java |  11 +-
 .../cache/partitioned/RemoveAllPRMessageTest.java  |   3 +-
 .../cache/partitioned/RemoveBucketMessageTest.java |   5 +-
 .../cache/partitioned/ShutdownAllDUnitTest.java    |  10 +-
 .../cache/partitioned/SizeMessageTest.java         |   3 +-
 .../StreamingPartitionOperationManyDUnitTest.java  |  13 +-
 .../StreamingPartitionOperationOneDUnitTest.java   |  13 +-
 .../fixed/FixedPartitioningDUnitTest.java          |  45 +-
 .../fixed/FixedPartitioningTestBase.java           |  29 +-
 .../fixed/FixedPartitioningTestBaseJUnitTest.java  |   4 +-
 ...oningWithColocationAndPersistenceDUnitTest.java |  25 +-
 .../fixed/QuarterPartitionResolver.java            |   4 +-
 .../fixed/SingleHopQuarterPartitionResolver.java   |   4 +-
 .../rebalance/BucketOperatorWrapperTest.java       |   6 +-
 .../BackupInspectorIntegrationTest.java            |   3 +-
 .../BackupPrepareAndFinishMsgDUnitTest.java        |  11 +-
 .../PersistentRVVRecoveryDUnitTest.java            |  19 +-
 .../PersistentRecoveryOrderDUnitTest.java          |  14 +-
 .../PersistentRecoveryOrderOldConfigDUnitTest.java |  13 +-
 .../persistence/PersistentReplicatedTestBase.java  |  11 +-
 .../rollingupgrade/RollingUpgrade2DUnitTest.java   |  72 +-
 .../rollingupgrade/RollingUpgradeDUnitTest.java    |  52 +-
 .../cache/snapshot/GFSnapshotDUnitTest.java        |   9 +-
 .../internal/cache/tier/Bug40396DUnitTest.java     |   4 +-
 .../sockets/AcceptorImplClientQueueDUnitTest.java  |   6 +-
 .../cache/tier/sockets/AcceptorImplDUnitTest.java  |  20 +-
 .../cache/tier/sockets/AcceptorImplJUnitTest.java  |  31 +-
 ...dCompatibilityHigherVersionClientDUnitTest.java |   2 +-
 .../cache/tier/sockets/Bug36269DUnitTest.java      |   2 +-
 .../cache/tier/sockets/Bug36457DUnitTest.java      |   4 +-
 .../cache/tier/sockets/Bug36805DUnitTest.java      |   7 +-
 .../cache/tier/sockets/Bug36829DUnitTest.java      |   2 +-
 .../cache/tier/sockets/Bug36995DUnitTest.java      |   2 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java      |  22 +-
 .../cache/tier/sockets/Bug37805DUnitTest.java      |   2 +-
 .../internal/cache/tier/sockets/CCUStatsTest.java  |   5 +-
 .../CacheServerMaxConnectionsJUnitTest.java        |   2 +-
 ...CacheServerSelectorMaxConnectionsJUnitTest.java |   6 +-
 .../cache/tier/sockets/CacheServerTestUtil.java    |  10 +-
 .../sockets/CacheServerTransactionsDUnitTest.java  |   2 +-
 .../CacheServerTransactionsSelectorDUnitTest.java  |   8 +-
 .../cache/tier/sockets/CacheServerUtils.java       |   6 +-
 .../tier/sockets/ClearPropagationDUnitTest.java    |   2 +-
 .../tier/sockets/ClientConflationDUnitTest.java    |  13 +-
 .../tier/sockets/ClientHealthMonitorJUnitTest.java |   2 +-
 .../ClientHealthMonitorSelectorJUnitTest.java      |   6 +-
 .../sockets/ClientInterestNotifyDUnitTest.java     |   8 +-
 .../ClientServerForceInvalidateDUnitTest.java      |   2 +-
 .../tier/sockets/ClientServerMiscDUnitTest.java    |   8 +-
 .../sockets/ClientServerMiscSelectorDUnitTest.java |   3 +-
 .../cache/tier/sockets/ConflationDUnitTest.java    |  23 +-
 .../tier/sockets/ConnectionProxyJUnitTest.java     |  25 +-
 .../DataSerializerPropogationDUnitTest.java        |  10 +-
 .../cache/tier/sockets/DeltaEOFException.java      |   2 +-
 .../sockets/DestroyEntryPropagationDUnitTest.java  |   2 +-
 .../sockets/DurableClientBug39997DUnitTest.java    |   2 +-
 .../sockets/DurableClientQueueSizeDUnitTest.java   |  11 +-
 .../DurableClientReconnectAutoDUnitTest.java       |   2 +-
 .../sockets/DurableClientReconnectDUnitTest.java   |   5 +-
 .../tier/sockets/DurableClientStatsDUnitTest.java  |   4 +-
 .../tier/sockets/DurableRegistrationDUnitTest.java |   9 +-
 .../sockets/DurableResponseMatrixDUnitTest.java    |   4 +-
 .../tier/sockets/EventIDVerificationDUnitTest.java |   5 +-
 .../sockets/EventIDVerificationInP2PDUnitTest.java |   2 +-
 .../internal/cache/tier/sockets/FaultyDelta.java   |   2 +-
 .../sockets/FilterProfileIntegrationJUnitTest.java |  11 +-
 .../cache/tier/sockets/FilterProfileJUnitTest.java |  17 +-
 .../sockets/ForceInvalidateEvictionDUnitTest.java  |  15 +-
 .../ForceInvalidateOffHeapEvictionDUnitTest.java   |   4 +-
 .../cache/tier/sockets/HABug36738DUnitTest.java    |   2 +-
 .../tier/sockets/HAInterestPart1DUnitTest.java     |  13 +-
 .../cache/tier/sockets/HAInterestTestCase.java     |  10 +-
 .../sockets/HAStartupAndFailoverDUnitTest.java     |  18 +-
 .../internal/cache/tier/sockets/HandShakeTest.java |   5 +-
 .../sockets/InstantiatorPropagationDUnitTest.java  |   2 +-
 .../cache/tier/sockets/InterestListDUnitTest.java  |  14 +-
 .../sockets/InterestListEndpointDUnitTest.java     |   2 +-
 .../sockets/InterestListEndpointPRDUnitTest.java   |  11 +-
 .../InterestListEndpointSelectorDUnitTest.java     |   8 +-
 .../sockets/InterestListFailoverDUnitTest.java     |   4 +-
 .../sockets/InterestListRecoveryDUnitTest.java     |   2 +-
 .../sockets/InterestRegrListenerDUnitTest.java     |   3 +-
 .../sockets/InterestResultPolicyDUnitTest.java     |   4 +-
 .../cache/tier/sockets/MessageIdExtractorTest.java |   9 +-
 .../cache/tier/sockets/MessageJUnitTest.java       |   2 +-
 .../tier/sockets/NewRegionAttributesDUnitTest.java |  22 +-
 .../tier/sockets/ObjectPartListJUnitTest.java      |   2 +-
 .../internal/cache/tier/sockets/PartTest.java      |   7 +-
 .../tier/sockets/RedundancyLevelJUnitTest.java     |  25 +-
 .../sockets/RedundancyLevelPart1DUnitTest.java     |   2 +-
 .../sockets/RedundancyLevelPart2DUnitTest.java     |   2 +-
 .../sockets/RedundancyLevelPart3DUnitTest.java     |   2 +-
 .../cache/tier/sockets/RegionCloseDUnitTest.java   |   4 +-
 ...isterInterestBeforeRegionCreationDUnitTest.java |   4 +-
 .../sockets/RegisterInterestKeysDUnitTest.java     |   2 +-
 .../sockets/RegisterInterestKeysPRDUnitTest.java   |  11 +-
 .../tier/sockets/ReliableMessagingDUnitTest.java   |   6 +-
 .../tier/sockets/ServerConnectionFactoryTest.java  |  28 +-
 .../cache/tier/sockets/ServerConnectionTest.java   |  25 +-
 .../tier/sockets/UnregisterInterestDUnitTest.java  |  24 +-
 .../tier/sockets/UpdatePropagationDUnitTest.java   |   6 +-
 .../VerifyEventIDGenerationInP2PDUnitTest.java     |   2 +-
 ...ifyUpdatesFromNonInterestEndPointDUnitTest.java |   2 +-
 .../versions/RegionVersionHolderJUnitTest.java     |   8 +-
 .../RegionVersionHolderRandomJUnitTest.java        |   2 +-
 .../versions/RegionVersionVectorJUnitTest.java     |   1 +
 .../cache/versions/TombstoneDUnitTest.java         |   7 +-
 .../cache/wan/AsyncEventQueueTestBase.java         |   8 +-
 .../internal/cache/wan/MyGatewayEventFilter.java   |   6 +-
 .../wan/PossibleDuplicateAsyncEventListener.java   |   6 +-
 ...ilGatewaySenderFlushedCoordinatorJUnitTest.java |  13 +-
 .../AbstractMovingAsyncEventListener.java          |   8 +-
 .../asyncqueue/AsyncEventListenerDUnitTest.java    |  73 +-
 .../AsyncEventListenerOffHeapDUnitTest.java        |   6 +-
 .../asyncqueue/AsyncEventQueueStatsDUnitTest.java  |  13 +-
 .../AsyncEventQueueValidationsJUnitTest.java       |   4 +-
 .../ConcurrentAsyncEventQueueDUnitTest.java        |  19 +-
 .../ConcurrentAsyncEventQueueOffHeapDUnitTest.java |   6 +-
 .../CommonParallelAsyncEventQueueDUnitTest.java    |  11 +-
 ...monParallelAsyncEventQueueOffHeapDUnitTest.java |   6 +-
 ...elGatewaySenderFlushedCoordinatorJUnitTest.java |  35 +-
 .../cache/wan/serial/DestroyMessageTest.java       |   5 +-
 .../cache/xmlcache/AbstractEntityResolverTest.java |  12 +-
 .../cache/xmlcache/CacheCreationJUnitTest.java     |   6 +-
 .../CacheTransactionManagerCreationTest.java       |   5 +-
 .../cache/xmlcache/CacheXmlParserJUnitTest.java    |  43 +-
 .../cache/xmlcache/CacheXmlVersionJUnitTest.java   |   4 +-
 .../cache/xmlcache/DefaultEntityResolver2Test.java |   3 +-
 .../cache/xmlcache/RegionCreationJUnitTest.java    |   4 +-
 .../cache/xmlcache/XmlGeneratorUtilsJUnitTest.java |   3 +-
 .../CompressionCacheConfigDUnitTest.java           |  11 +-
 .../CompressionCacheListenerDUnitTest.java         |  29 +-
 .../CompressionRegionConfigDUnitTest.java          |  59 +-
 .../CompressionRegionFactoryDUnitTest.java         |  23 +-
 .../CompressionRegionOperationsDUnitTest.java      |  28 +-
 .../compression/CompressionStatsDUnitTest.java     |  63 +-
 .../datasource/AbstractPoolCacheJUnitTest.java     |   1 +
 .../internal/datasource/CleanUpJUnitTest.java      |  27 +-
 .../ConnectionPoolCacheImplJUnitTest.java          |  30 +-
 .../datasource/ConnectionPoolingJUnitTest.java     |  46 +-
 .../datasource/DataSourceFactoryJUnitTest.java     |   1 +
 .../internal/datasource/RestartJUnitTest.java      |  24 +-
 .../geode/internal/i18n/BasicI18nJUnitTest.java    |   4 +-
 .../io/CompositeOutputStreamJUnitTest.java         |   2 +-
 ...hChildrenRollingFileHandlerIntegrationTest.java |   4 +-
 .../geode/internal/jndi/ContextJUnitTest.java      |   3 +-
 .../internal/jta/BlockingTimeOutJUnitTest.java     |  36 +-
 .../org/apache/geode/internal/jta/CacheUtils.java  |  26 +-
 .../internal/jta/ClientServerJTADUnitTest.java     |   7 +-
 .../geode/internal/jta/DataSourceJTAJUnitTest.java | 146 ++--
 .../geode/internal/jta/ExceptionJUnitTest.java     |   1 +
 .../internal/jta/GlobalTransactionJUnitTest.java   |   1 +
 .../org/apache/geode/internal/jta/JTAUtils.java    |  25 +-
 .../internal/jta/JtaIntegrationJUnitTest.java      |  21 +-
 .../internal/jta/SetOperationJTAJUnitTest.java     |  24 +-
 .../internal/jta/TransactionImplJUnitTest.java     |  18 +-
 .../jta/TransactionManagerImplJUnitTest.java       |  18 +-
 .../internal/jta/TransactionTimeOutJUnitTest.java  |   1 +
 .../internal/jta/UserTransactionImplJUnitTest.java |  20 +-
 .../geode/internal/jta/dunit/CommitThread.java     |   2 +-
 .../internal/jta/dunit/ExceptionsDUnitTest.java    |   1 +
 .../internal/jta/dunit/IdleTimeOutDUnitTest.java   |   1 +
 .../internal/jta/dunit/LoginTimeOutDUnitTest.java  |   1 +
 .../internal/jta/dunit/MaxPoolSizeDUnitTest.java   |   1 +
 .../geode/internal/jta/dunit/RollbackThread.java   |   2 +-
 .../jta/dunit/TransactionTimeOutDUnitTest.java     |   1 +
 .../jta/dunit/TxnManagerMultiThreadDUnitTest.java  |  19 +-
 .../internal/jta/dunit/TxnTimeOutDUnitTest.java    |   2 +-
 .../internal/jta/functional/CacheJUnitTest.java    |   4 +-
 .../internal/jta/functional/TestXACacheLoader.java |   2 +-
 .../geode/internal/lang/ClassUtilsJUnitTest.java   |   9 +-
 .../internal/lang/InOutParameterJUnitTest.java     |   2 +-
 .../geode/internal/lang/ObjectUtilsJUnitTest.java  |   2 +-
 .../geode/internal/lang/StringUtilsJUnitTest.java  |  15 +-
 .../lang/SystemPropertyHelperJUnitTest.java        |   3 +-
 .../geode/internal/lang/SystemUtilsJUnitTest.java  |   2 +-
 .../geode/internal/lang/ThrowableUtilsTest.java    |   2 +-
 .../logging/DistributedSystemLogFileJUnitTest.java |  39 +-
 .../logging/LogServiceIntegrationJUnitTest.java    |   2 +-
 .../logging/log4j/ConfigLocatorJUnitTest.java      |   2 +-
 .../log4j/FastLoggerIntegrationJUnitTest.java      |  14 +-
 .../FastLoggerWithDefaultConfigJUnitTest.java      |   2 +-
 .../logging/log4j/Log4J2PerformanceTest.java       |  21 +-
 .../geode/internal/logging/log4j/LogLevelTest.java |   5 +-
 .../log4j/LogWriterLoggerPerformanceTest.java      |  21 +-
 .../CustomConfigWithCacheIntegrationTest.java      |  25 +-
 .../net/ClientSocketFactoryIntegrationTest.java    |   2 +-
 .../geode/internal/net/DummySocketCreator.java     |   5 +-
 .../net/SSLConfigurationFactoryJUnitTest.java      |   3 +-
 .../internal/net/SSLSocketIntegrationTest.java     |  37 +-
 .../geode/internal/net/SocketCloserJUnitTest.java  |  15 +-
 .../net/SocketCreatorFactoryJUnitTest.java         |   4 +-
 .../geode/internal/net/SocketCreatorJUnitTest.java |   5 +-
 .../geode/internal/net/SocketUtilsJUnitTest.java   |   2 +-
 .../internal/offheap/FreeListManagerTest.java      |  23 +-
 .../offheap/FreeListOffHeapRegionJUnitTest.java    |   3 +-
 .../geode/internal/offheap/InlineKeyJUnitTest.java |  21 +-
 .../MemoryAllocatorFillPatternIntegrationTest.java |  21 +-
 .../MemoryAllocatorFillPatternJUnitTest.java       |  19 +-
 .../internal/offheap/MemoryBlockNodeJUnitTest.java |  25 +-
 .../internal/offheap/NullOffHeapMemoryStats.java   |   2 +-
 .../offheap/NullOutOfOffHeapMemoryListener.java    |   2 +-
 .../internal/offheap/OffHeapHelperJUnitTest.java   |   2 +-
 .../internal/offheap/OffHeapIndexJUnitTest.java    |  25 +-
 .../geode/internal/offheap/OffHeapRegionBase.java  |  33 +-
 .../offheap/OffHeapRegionEntryHelperJUnitTest.java |   4 +-
 .../internal/offheap/OffHeapStorageJUnitTest.java  |  21 +-
 .../offheap/OffHeapValidationJUnitTest.java        |  33 +-
 .../offheap/OldFreeListOffHeapRegionJUnitTest.java |   3 +-
 .../offheap/ReferenceCountHelperImplTest.java      |   4 +-
 .../offheap/ReferenceCountHelperJUnitTest.java     |  12 +-
 .../offheap/TxReleasesOffHeapOnCloseJUnitTest.java |  17 +-
 .../LocalProcessLauncherDistributedTest.java       |   2 +-
 .../internal/process/NativeProcessUtilsTest.java   |   4 +-
 .../internal/process/PidFileIntegrationTest.java   |   2 +-
 .../security/CallbackInstantiatorTest.java         |   5 +-
 .../security/LegacySecurityServiceTest.java        |   3 +-
 .../security/SecurityServiceFactoryTest.java       |  15 +-
 .../internal/security/SecurityServiceTest.java     |   9 +-
 .../internal/size/ObjectTraverserJUnitTest.java    |  13 +-
 .../statistics/FileSizeLimitIntegrationTest.java   |  17 +-
 .../GemFireStatSamplerIntegrationTest.java         |   2 +-
 .../internal/statistics/SampleCollectorTest.java   |   4 +-
 .../SimpleStatSamplerIntegrationTest.java          |  21 +-
 ...chiveWithMissingResourceTypeRegressionTest.java |   7 +-
 .../StatArchiveWriterReaderIntegrationTest.java    |   2 +-
 .../internal/statistics/StatArchiveWriterTest.java |   3 +-
 .../statistics/StatMonitorHandlerTest.java         |  15 +-
 ...MonitorHandlerWithEnabledMonitorThreadTest.java |  13 +-
 .../statistics/StatSamplerIntegrationTest.java     |   2 +-
 .../internal/statistics/StatSamplerTestCase.java   |   2 +-
 .../StatTypesAreRolledOverRegressionTest.java      |   2 +-
 .../statistics/StatisticsDistributedTest.java      |   4 +-
 .../internal/statistics/StatisticsMonitorTest.java |   4 +-
 .../statistics/ValueMonitorIntegrationTest.java    |  31 +-
 .../internal/stats50/AtomicStatsJUnitTest.java     |  23 +-
 .../geode/internal/tcp/ConnectionJUnitTest.java    |   2 +-
 .../geode/internal/tcp/ConnectionTableTest.java    |  19 +-
 .../apache/geode/internal/tcp/ConnectionTest.java  |   9 +-
 .../apache/geode/internal/util/ArrayUtilsTest.java |   4 +-
 ...BlobHelperWithThreadContextClassLoaderTest.java |   1 -
 .../internal/util/CollectionUtilsJUnitTest.java    |  13 +-
 .../apache/geode/internal/util/HostNameTest.java   |   7 +-
 .../geode/internal/util/IOUtilsJUnitTest.java      |   4 +-
 .../util/concurrent/FutureResultJUnitTest.java     |  13 +-
 .../concurrent/cm/CountedMapLoopsJUnitTest.java    |   3 +-
 .../util/concurrent/cm/IntMapCheckJUnitTest.java   |   1 -
 .../internal/util/concurrent/cm/LoopHelpers.java   |   6 +-
 .../util/concurrent/cm/MapCheckJUnitTest.java      |   1 -
 .../util/concurrent/cm/MapLoopsJUnitTest.java      |   3 +-
 .../concurrent/cm/StringMapLoopsJUnitTest.java     |   3 +-
 .../geode/management/DLockManagementDUnitTest.java |   1 -
 .../apache/geode/management/JMXMBeanDUnitTest.java |   2 +-
 .../org/apache/geode/management/MBeanUtil.java     |  20 +-
 .../management/OffHeapManagementDUnitTest.java     |   2 +-
 .../geode/management/QueryDataDUnitTest.java       |   2 +-
 .../bean/stats/AsyncEventQueueStatsJUnitTest.java  |   2 +-
 .../stats/DistributedSystemStatsJUnitTest.java     |  23 +-
 .../bean/stats/GatewayMBeanBridgeJUnitTest.java    |   3 +-
 .../management/bean/stats/MBeanStatsTestCase.java  |  16 +-
 .../bean/stats/RegionStatsJUnitTest.java           |   2 +-
 .../internal/CompositeBuilderViaFromTest.java      |   7 +-
 .../internal/CompositeBuilderViaProxyTest.java     |   7 +-
 .../management/internal/IdentityConverterTest.java |   3 +-
 .../management/internal/JettyHelperJUnitTest.java  |   2 +-
 .../beans/DistributedSystemBridgeJUnitTest.java    |   2 +-
 .../cli/AbstractCliAroundInterceptorJUnitTest.java |   4 +-
 .../cli/ClasspathScanLoadHelperJUnitTest.java      |   2 +-
 .../internal/cli/CommandManagerJUnitTest.java      |   2 +-
 .../internal/cli/GfshParserJUnitTest.java          |   9 +-
 .../internal/cli/HeadlessGfshIntegrationTest.java  |  19 +-
 .../management/internal/cli/NetstatDUnitTest.java  |  12 +-
 .../internal/cli/TableBuilderJUnitTest.java        |  25 +-
 .../cli/commands/AlterRegionCommandDUnitTest.java  |   2 +-
 .../internal/cli/commands/CliCommandTestBase.java  |  25 +-
 .../cli/commands/ConcurrentDeployDUnitTest.java    |  19 +-
 .../internal/cli/commands/ConnectCommandTest.java  |   2 +-
 ...DeployCommandFunctionRegistrationDUnitTest.java |   2 +-
 .../commands/DeployCommandRedeployDUnitTest.java   |   4 +-
 .../cli/commands/DeployWithGroupsDUnitTest.java    |   6 +-
 .../commands/DescribeConfigCommandJUnitTest.java   |   2 +-
 .../commands/DescribeMembersCommandDUnitTest.java  |   2 +-
 .../cli/commands/ExportDataIntegrationTest.java    |   2 +-
 .../cli/commands/ExportLogsCommandTest.java        |  19 +-
 .../internal/cli/commands/ExportLogsDUnitTest.java |   4 +-
 .../cli/commands/ExportLogsIntegrationTest.java    |   2 +-
 .../cli/commands/ExportLogsStatsDUnitTest.java     |   2 +-
 .../internal/cli/commands/ExportLogsTestSuite.java |   9 +-
 .../ExportLogsWithMemberGroupDUnitTest.java        |   2 +-
 .../cli/commands/FunctionCommandsDUnitTest.java    |  20 +-
 .../cli/commands/GemfireDataCommandsDUnitTest.java |   2 +-
 .../cli/commands/GfshCommandIntegrationTest.java   |   2 +-
 .../cli/commands/ImportDataIntegrationTest.java    |   2 +-
 .../cli/commands/IndexCommandsIntegrationTest.java |   1 -
 .../IndexCommandsShareConfigurationDUnitTest.java  |   3 +-
 .../commands/ListAndDescribeRegionDUnitTest.java   |   2 +-
 .../cli/commands/ListIndexCommandDUnitTest.java    |  10 +-
 .../cli/commands/ListIndexCommandJUnitTest.java    |   2 +-
 .../cli/commands/ListMembersCommandDUnitTest.java  |   2 +-
 .../internal/cli/commands/QueryCommandTest.java    |   2 +-
 .../cli/commands/QueueCommandsDUnitTest.java       |   2 +-
 .../cli/commands/ShowDeadlockDUnitTest.java        |   5 +-
 .../cli/commands/ShowMetricsCommandJUnitTest.java  |  11 +-
 .../cli/commands/ShowMetricsDUnitTest.java         |  24 +-
 .../commands/ShowMissingDiskStoresDUnitTest.java   |   2 +-
 .../cli/commands/ToUpperResultCollector.java       |   8 +-
 .../cli/commands/VersionCommandJUnitTest.java      |  84 ++
 .../GfshStatusCommandsIntegrationTest.java         |   4 +-
 .../lifecycle/StartJConsoleCommandTest.java        |   5 +-
 .../cli/converters/LogLevelConverterTest.java      |   7 +-
 .../functions/DataCommandFunctionJUnitTest.java    |  19 +-
 .../DataCommandFunctionWithPDXJUnitTest.java       |  13 +-
 .../ExportLogsFunctionIntegrationTest.java         |   2 +-
 .../internal/cli/functions/Geode3544JUnitTest.java |  12 +-
 .../functions/ListDiskStoresFunctionJUnitTest.java |   2 +-
 .../cli/functions/ListIndexFunctionJUnitTest.java  |   2 +-
 .../ShowMissingDiskStoresFunctionJUnitTest.java    |   2 +-
 .../functions/SizeExportLogsFunctionFileTest.java  |  19 +-
 .../cli/functions/SizeExportLogsFunctionTest.java  |   2 +-
 .../internal/cli/help/HelpBlockUnitTest.java       |   5 +-
 .../internal/cli/help/HelperUnitTest.java          |   9 +-
 .../internal/cli/result/CommandResultTest.java     |   4 +-
 .../cli/shell/GfshConfigInitFileJUnitTest.java     |   4 +-
 .../internal/cli/shell/GfshHistoryJUnitTest.java   |  11 +-
 .../cli/shell/GfshMultilineCommandTest.java        |  11 +-
 .../internal/cli/util/BytesToStringTest.java       |   3 +-
 .../cli/util/ExportLogsCacheWriterUnitTest.java    |   5 +-
 .../internal/cli/util/HostUtilsTest.java           |   5 +-
 .../management/internal/cli/util/JdkToolTest.java  |   9 +-
 .../cli/util/LogExporterIntegrationTest.java       |   2 +-
 .../internal/cli/util/LogExporterTest.java         |  19 +-
 .../internal/cli/util/LogFilterTest.java           |  11 +-
 .../internal/cli/util/LogLevelExtractorTest.java   |   3 +-
 .../management/internal/cli/util/LogSizerTest.java |  13 +-
 .../ClusterConfigDeployJarDUnitTest.java           |   2 +-
 .../ClusterConfigDistributionDUnitTest.java        |   4 +-
 .../ClusterConfigImportDUnitTest.java              |   2 +-
 .../configuration/ClusterConfigTestBase.java       |   2 +-
 .../ClusterConfigWithSecurityDUnitTest.java        |   2 +-
 .../ClusterConfigurationServiceDUnitTest.java      |  27 +-
 ...usterConfigurationServiceUsingDirDUnitTest.java |  23 +-
 .../configuration/EventTestCacheWriter.java        |   4 +-
 .../ImportClusterConfigDistributedTest.java        |   2 +-
 .../domain/CacheElementJUnitTest.java              |   7 +-
 .../utils/XmlUtilsAddNewNodeJUnitTest.java         |  56 +-
 .../configuration/utils/XmlUtilsJUnitTest.java     |   2 +-
 .../internal/pulse/TestFunctionsDUnitTest.java     |  17 +-
 .../internal/pulse/TestHeapDUnitTest.java          |  13 +-
 .../internal/pulse/TestLocatorsDUnitTest.java      |  13 +-
 .../security/AccessControlMBeanJUnitTest.java      |  13 +-
 .../CacheServerMBeanAuthenticationJUnitTest.java   |   2 +-
 .../CacheServerMBeanAuthorizationJUnitTest.java    |   4 +-
 ...acheServerMBeanWithShiroIniIntegrationTest.java |   4 +-
 .../internal/security/CliCommandsSecurityTest.java |   4 +-
 .../security/DataCommandsSecurityTest.java         |   4 +-
 .../security/DeployCommandsSecurityTest.java       |   4 +-
 .../security/DiskStoreMXBeanSecurityJUnitTest.java |   4 +-
 .../DistributedSystemMXBeanSecurityTest.java       |   4 +-
 .../security/GatewayReceiverMBeanSecurityTest.java |   4 +-
 .../security/GatewaySenderMBeanSecurityTest.java   |   4 +-
 .../security/GfshCommandsPostProcessorTest.java    |   4 +-
 .../internal/security/JavaRmiServerNameTest.java   |   5 +-
 .../LockServiceMBeanAuthorizationJUnitTest.java    |   4 +-
 .../internal/security/MBeanSecurityJUnitTest.java  |   4 +-
 .../ManagerMBeanAuthorizationJUnitTest.java        |   4 +-
 .../security/MemberMBeanSecurityJUnitTest.java     |   4 +-
 .../internal/security/MultiUserDUnitTest.java      |   6 +-
 ...urityServiceWithCustomRealmIntegrationTest.java |   5 +-
 ...SecurityServiceWithShiroIniIntegrationTest.java |  13 +-
 .../ReadOpFileAccessControllerJUnitTest.java       |  38 +-
 .../org/apache/geode/management/model/Item.java    |   2 +-
 .../org/apache/geode/management/model/Order.java   |   2 +-
 .../memcached/GemcachedBinaryClientJUnitTest.java  |   9 +-
 .../memcached/GemcachedDevelopmentJUnitTest.java   |  29 +-
 .../geode/pdx/AutoSerializableJUnitTest.java       |  35 +-
 .../org/apache/geode/pdx/ByteSourceJUnitTest.java  |   4 +-
 .../pdx/ClientsWithVersioningRetryDUnitTest.java   |   2 +-
 .../apache/geode/pdx/JSONFormatterJUnitTest.java   |   6 +-
 .../geode/pdx/JSONPdxClientServerDUnitTest.java    |  10 +-
 .../test/java/org/apache/geode/pdx/NestedPdx.java  |   1 -
 .../pdx/OffHeapByteBufferByteSourceJUnitTest.java  |   2 +-
 .../geode/pdx/OffHeapByteSourceJUnitTest.java      |   6 +-
 .../geode/pdx/PDXAsyncEventQueueDUnitTest.java     |  14 +-
 .../apache/geode/pdx/PdxAttributesJUnitTest.java   |  25 +-
 .../apache/geode/pdx/PdxClientServerDUnitTest.java |  15 +-
 .../geode/pdx/PdxDeserializationDUnitTest.java     |  27 +-
 .../geode/pdx/PdxInstanceFactoryJUnitTest.java     |  21 +-
 .../org/apache/geode/pdx/PdxInstanceJUnitTest.java |  33 +-
 .../apache/geode/pdx/PdxSerializableDUnitTest.java |  17 +-
 .../apache/geode/pdx/PdxSerializableJUnitTest.java |  55 +-
 .../org/apache/geode/pdx/PdxStringJUnitTest.java   |   4 +-
 .../apache/geode/pdx/PdxTypeExportDUnitTest.java   |  15 +-
 .../geode/pdx/TestObjectForJSONFormatter.java      |   2 -
 .../java/org/apache/geode/redis/AuthJUnitTest.java |  24 +-
 .../apache/geode/redis/ConcurrentStartTest.java    |  20 +-
 .../org/apache/geode/redis/HashesJUnitTest.java    |  22 +-
 .../org/apache/geode/redis/ListsJUnitTest.java     |  24 +-
 .../org/apache/geode/redis/RedisServerTest.java    |  13 +-
 .../java/org/apache/geode/redis/SetsJUnitTest.java |  21 +-
 .../apache/geode/redis/SortedSetsJUnitTest.java    |  22 +-
 .../org/apache/geode/redis/StringsJunitTest.java   |  20 +-
 .../executor/AbstractScanExecutorTest.java         |   5 +-
 .../CacheFactoryWithSecurityObjectTest.java        |  13 +-
 .../apache/geode/security/ClientAuthDUnitTest.java |  11 +-
 .../security/ClientAuthenticationDUnitTest.java    |  18 +-
 .../security/ClientAuthenticationTestCase.java     |   3 +-
 .../security/ClientAuthorizationDUnitTest.java     |   2 +-
 .../security/ClientAuthorizationTestCase.java      |   2 +-
 .../security/ClientContainsKeyAuthDUnitTest.java   |  11 +-
 .../ClientDestroyInvalidateAuthDUnitTest.java      |  10 +-
 .../security/ClientDestroyRegionAuthDUnitTest.java |   9 +-
 .../ClientExecuteFunctionAuthDUnitTest.java        |   4 +-
 .../ClientExecuteRegionFunctionAuthDUnitTest.java  |   4 +-
 .../geode/security/ClientGetAllAuthDUnitTest.java  |  17 +-
 .../security/ClientGetEntryAuthDUnitTest.java      |  11 +-
 .../geode/security/ClientGetPutAuthDUnitTest.java  |  23 +-
 .../security/ClientRegionClearAuthDUnitTest.java   |   9 +-
 .../ClientRegisterInterestAuthDUnitTest.java       |  15 +-
 .../security/ClientRemoveAllAuthDUnitTest.java     |  13 +-
 .../ClientUnregisterInterestAuthDUnitTest.java     |   9 +-
 .../ClusterConfigWithoutSecurityDUnitTest.java     |   2 +-
 .../security/GemFireSecurityExceptionTest.java     |   1 +
 .../NoShowValue1PostProcessorDUnitTest.java        |  19 +-
 .../geode/security/NotAuthorizedExceptionTest.java |   1 +
 .../geode/security/P2PAuthenticationDUnitTest.java |   6 +-
 .../apache/geode/security/PDXPostProcessor.java    |   6 +-
 .../geode/security/PDXPostProcessorDUnitTest.java  |   4 +-
 .../geode/security/PeerAuthenticatorDUnitTest.java |   2 +-
 .../PeerSecurityWithEmbeddedLocatorDUnitTest.java  |  13 +-
 .../geode/security/PostProcessorDUnitTest.java     |  19 +-
 .../security/SecurityClusterConfigDUnitTest.java   |  15 +-
 .../SecurityManagerLifecycleDistributedTest.java   |  15 +-
 .../SecurityManagerLifecycleIntegrationTest.java   |  13 +-
 .../geode/security/SimpleSecurityManagerTest.java  |  11 +-
 .../apache/geode/security/TestSecurityManager.java |  19 +-
 .../generator/AuthzCredentialGenerator.java        |  44 +-
 .../security/generator/CredentialGenerator.java    |  14 +-
 .../generator/LdapUserCredentialGenerator.java     |  15 +-
 .../security/generator/SSLCredentialGenerator.java |   9 +-
 .../UserPasswordWithExtraPropsAuthInit.java        |   8 +-
 .../security/templates/DummyAuthorization.java     |   2 +-
 .../templates/FunctionSecurityPrmsHolder.java      |   2 +-
 .../security/templates/LdapUserAuthenticator.java  |   1 +
 .../geode/security/templates/PKCSAuthInit.java     |   4 +-
 .../security/templates/UserPasswordAuthInit.java   |   4 +-
 .../security/templates/UsernamePrincipal.java      |   2 +-
 .../geode/security/templates/XmlAuthorization.java |  27 +-
 .../geode/security/templates/XmlErrorHandler.java  |   4 +-
 .../java/org/apache/geode/sequence/LineMapper.java |   2 +-
 .../apache/geode/sequence/SelectGraphDialog.java   |  14 +-
 .../org/apache/geode/sequence/SequenceDiagram.java |   5 +-
 .../org/apache/geode/sequence/SequencePanel.java   |   3 +-
 .../org/apache/geode/sequence/StateColorMap.java   |   4 +-
 .../java/org/apache/geode/sequence/TimeAxis.java   |   3 +-
 .../org/apache/geode/sequence/ZoomingPanel.java    |   3 +-
 .../java/org/apache/geode/test/dunit/Assert.java   |   2 +-
 .../apache/geode/test/dunit/DUnitBlackboard.java   |   1 +
 .../org/apache/geode/test/dunit/DebuggerUtils.java |   2 +-
 .../geode/test/dunit/DistributedTestUtils.java     |  12 +-
 .../apache/geode/test/dunit/IgnoredException.java  |  14 +-
 .../java/org/apache/geode/test/dunit/Invoke.java   |   4 +-
 .../java/org/apache/geode/test/dunit/Jitter.java   |  10 +-
 .../apache/geode/test/dunit/LogWriterUtils.java    |  17 +-
 .../org/apache/geode/test/dunit/NetworkUtils.java  |  10 +-
 .../geode/test/dunit/SerializableCallable.java     |   2 +-
 .../geode/test/dunit/StoppableWaitCriterion.java   |   2 +-
 .../org/apache/geode/test/dunit/ThreadUtils.java   |  12 +-
 .../test/java/org/apache/geode/test/dunit/VM.java  |   8 +-
 .../java/org/apache/geode/test/dunit/Wait.java     |  18 +-
 .../dunit/cache/internal/JUnit4CacheTestCase.java  |   2 +-
 .../examples/DistributedTestCaseExampleTest.java   |   1 -
 .../dunit/internal/DUnitBlackboardDUnitTest.java   |  11 +-
 .../dunit/internal/InternalBlackboardImpl.java     |   4 +-
 .../test/dunit/rules/CleanupDUnitVMsRule.java      |   5 +-
 .../test/dunit/rules/LocatorServerStartupRule.java |   2 +-
 .../dunit/rules/tests/MemberStarterRuleTest.java   |   2 +-
 .../geode/test/dunit/standalone/ChildVM.java       |   2 +-
 .../geode/test/dunit/standalone/DUnitLauncher.java |   2 +-
 .../test/dunit/standalone/ProcessManager.java      |  13 +-
 .../test/dunit/standalone/VersionManager.java      |   6 +-
 .../dunit/standalone/VersionManagerJUnitTest.java  |   3 +-
 .../geode/test/dunit/tests/BasicDUnitTest.java     |   2 +-
 .../test/dunit/tests/JUnit4BasicDUnitTest.java     |   4 +-
 ...ridingGetPropertiesDisconnectsAllDUnitTest.java |  15 +-
 .../java/org/apache/geode/test/fake/Fakes.java     |  12 +-
 .../golden/FailWithErrorInOutputJUnitTest.java     |   2 +-
 .../golden/FailWithExtraLineInOutputJUnitTest.java |   4 +-
 ...ailWithLineMissingFromEndOfOutputJUnitTest.java |   2 +-
 ...WithLineMissingFromMiddleOfOutputJUnitTest.java |   2 +-
 .../FailWithLoggerErrorInOutputJUnitTest.java      |   2 +-
 .../FailWithLoggerFatalInOutputJUnitTest.java      |   2 +-
 .../FailWithLoggerWarnInOutputJUnitTest.java       |   2 +-
 .../golden/FailWithProblemInOutputTestCase.java    |   2 +-
 .../golden/FailWithSevereInOutputJUnitTest.java    |   2 +-
 .../golden/FailWithWarningInOutputJUnitTest.java   |   2 +-
 .../apache/geode/test/golden/GoldenComparator.java |   2 +-
 .../geode/test/golden/GoldenStringComparator.java  |   2 +-
 .../apache/geode/test/golden/GoldenTestCase.java   |  20 +-
 .../apache/geode/test/golden/PassJUnitTest.java    |   4 +-
 .../golden/PassWithExpectedErrorJUnitTest.java     |   2 +-
 .../golden/PassWithExpectedProblemTestCase.java    |   2 +-
 .../golden/PassWithExpectedSevereJUnitTest.java    |   2 +-
 .../golden/PassWithExpectedWarningJUnitTest.java   |   2 +-
 .../geode/test/golden/RegexGoldenComparator.java   |   2 +-
 .../geode/test/golden/StringGoldenComparator.java  |   2 +-
 .../apache/geode/test/process/MainLauncher.java    |   2 +-
 .../geode/test/process/ProcessOutputReader.java    |   2 +-
 .../apache/geode/test/process/ProcessWrapper.java  |   8 +-
 .../test/process/ProcessWrapperJUnitTest.java      |   2 +-
 .../java/org/apache/geode/util/JSR166TestCase.java |   2 +-
 .../java/org/apache/geode/util/test/TestUtil.java  |  10 +-
 .../java/org/apache/persistence/admin/Logger.java  |  36 +-
 .../org/apache/persistence/logging/Logger.java     |   2 +-
 .../persistence/logging/SimpleFormatter.java       |   1 -
 .../java/parReg/query/unittest/NewPortfolio.java   |   6 +-
 .../test/java/parReg/query/unittest/Position.java  |   5 +-
 .../geode/cache/client/internal/CloseCQOp.java     |   6 +-
 .../geode/cache/client/internal/CreateCQOp.java    |  20 +-
 .../cache/client/internal/CreateCQWithIROp.java    |   4 +-
 .../cache/client/internal/GetDurableCQsOp.java     |   6 +-
 .../cache/client/internal/ServerCQProxyImpl.java   |  16 +-
 .../geode/cache/client/internal/StopCQOp.java      |   6 +-
 .../cache/query/internal/cq/ClientCQImpl.java      |   4 +-
 .../query/internal/cq/CqAttributesMutatorImpl.java |   6 +-
 .../cache/query/internal/cq/CqConflatable.java     |  18 +-
 .../geode/cache/query/internal/cq/CqEventImpl.java |   3 +-
 .../cache/query/internal/cq/CqListenerImpl.java    |   2 +-
 .../geode/cache/query/internal/cq/CqQueryImpl.java |  20 +-
 .../cache/query/internal/cq/CqServiceImpl.java     |  14 +-
 .../query/internal/cq/CqServiceStatisticsImpl.java |   6 +-
 .../cache/query/internal/cq/CqServiceVsdStats.java |  24 +-
 .../cache/query/internal/cq/CqStatisticsImpl.java  |  12 +-
 .../cache/query/internal/cq/ServerCQImpl.java      |  10 +-
 .../cache/tier/sockets/command/ExecuteCQ.java      |   9 +-
 .../cache/query/cq/dunit/CqDataDUnitTest.java      |  41 +-
 .../cq/dunit/CqDataOptimizedExecuteDUnitTest.java  |  11 +-
 .../CqDataUsingPoolOptimizedExecuteDUnitTest.java  |  11 +-
 .../cache/query/cq/dunit/CqPerfDUnitTest.java      |  31 +-
 .../query/cq/dunit/CqPerfUsingPoolDUnitTest.java   |  27 +-
 .../cache/query/cq/dunit/CqQueryDUnitTest.java     |  60 +-
 .../cq/dunit/CqQueryOptimizedExecuteDUnitTest.java |  11 +-
 .../query/cq/dunit/CqQueryUsingPoolDUnitTest.java  |  24 +-
 .../CqQueryUsingPoolOptimizedExecuteDUnitTest.java |  11 +-
 .../cq/dunit/CqResultSetUsingPoolDUnitTest.java    |  37 +-
 ...esultSetUsingPoolOptimizedExecuteDUnitTest.java |  17 +-
 .../cache/query/cq/dunit/CqStateDUnitTest.java     |   1 -
 .../cache/query/cq/dunit/CqStatsDUnitTest.java     |   4 +-
 .../cq/dunit/CqStatsOptimizedExecuteDUnitTest.java |  11 +-
 .../query/cq/dunit/CqStatsUsingPoolDUnitTest.java  |   6 +-
 .../cache/query/cq/dunit/CqTimeTestListener.java   |  12 +-
 .../dunit/PartitionedRegionCqQueryDUnitTest.java   |  12 +-
 ...onedRegionCqQueryOptimizedExecuteDUnitTest.java |  11 +-
 .../query/cq/dunit/PrCqUsingPoolDUnitTest.java     |  37 +-
 .../PrCqUsingPoolOptimizedExecuteDUnitTest.java    |  11 +-
 .../cache/query/dunit/PdxQueryCQDUnitTest.java     |  21 +-
 .../query/dunit/QueryIndexUpdateRIDUnitTest.java   |  35 +-
 .../cache/query/dunit/QueryMonitorDUnitTest.java   |  19 +-
 .../cache/query/internal/cq/CqServiceUnitTest.java |   5 +-
 .../cache/snapshot/ClientSnapshotDUnitTest.java    |   2 +-
 .../AnalyzeCQSerializablesJUnitTest.java           |   3 +-
 .../cache/PRDeltaPropagationDUnitTest.java         |   6 +-
 .../geode/internal/cache/PutAllCSDUnitTest.java    |   8 +-
 .../cache/RemoteCQTransactionDUnitTest.java        |  23 +-
 .../internal/cache/ha/CQListGIIDUnitTest.java      |  18 +-
 .../internal/cache/ha/HADispatcherDUnitTest.java   |  33 +-
 .../tier/sockets/ClientServerMiscBCDUnitTest.java  |  11 +-
 .../tier/sockets/ClientToServerDeltaDUnitTest.java |  17 +-
 .../sockets/DeltaPropagationWithCQDUnitTest.java   |  12 +-
 ...ltaToRegionRelationCQRegistrationDUnitTest.java |  11 +-
 .../tier/sockets/DurableClientCrashDUnitTest.java  |   3 +-
 .../sockets/DurableClientNetDownDUnitTest.java     |   5 +-
 .../tier/sockets/DurableClientSimpleDUnitTest.java |  12 +-
 .../cache/tier/sockets/DurableClientTestCase.java  |  18 +-
 .../commands/DurableClientCommandsDUnitTest.java   |   2 +-
 .../management/internal/pulse/TestCQDUnitTest.java |  13 +-
 .../internal/pulse/TestClientsDUnitTest.java       |  15 +-
 .../internal/pulse/TestServerDUnitTest.java        |  13 +-
 .../security/CQPDXPostProcessorDUnitTest.java      |  23 +-
 .../geode/security/CQPostProcessorDunitTest.java   |   2 +-
 .../security/ClientAuthorizationCQDUnitTest.java   |   4 +-
 .../security/ClientAuthzObjectModDUnitTest.java    |  21 +-
 .../geode/security/ClientCQAuthDUnitTest.java      |   2 +-
 .../ClientCQPostAuthorizationDUnitTest.java        |   2 +-
 .../security/ClientPostAuthorizationDUnitTest.java |   2 +-
 .../geode/security/ClientQueryAuthDUnitTest.java   |   2 +-
 .../geode/security/MultiUserAPIDUnitTest.java      |  24 +-
 .../security/MultiUserDurableCQAuthzDUnitTest.java |   2 +-
 geode-json/src/main/java/org/json/JSONArray.java   |   6 +-
 .../src/main/java/org/json/JSONException.java      |   2 +-
 geode-json/src/main/java/org/json/JSONObject.java  |  96 +--
 geode-json/src/main/java/org/json/JSONString.java  |   2 +-
 .../src/main/java/org/json/JSONStringer.java       |   2 +-
 geode-json/src/main/java/org/json/JSONTokener.java |   2 +-
 .../apache/geode/test/compiler/ClassBuilder.java   |  22 +-
 .../test/junit/rules/ConditionalIgnoreRule.java    |   1 +
 .../geode/test/junit/rules/IgnoreUntilRule.java    |   3 +-
 .../apache/geode/test/junit/rules/RepeatRule.java  |   1 +
 .../geode/test/junit/rules/RestoreLocaleRule.java  |  10 +-
 .../apache/geode/test/junit/rules/RetryRule.java   |   8 +-
 .../apache/geode/test/junit/rules/RuleList.java    |   8 +-
 .../geode/test/junit/rules/TemporaryFileRule.java  |   2 +-
 .../junit/rules/UseJacksonForJsonPathRule.java     |   2 +-
 .../geode/test/junit/rules/gfsh/GfshScript.java    |   2 +-
 .../serializable/SerializableErrorCollector.java   |   4 +-
 .../rules/serializable/SerializableRuleList.java   |   7 +-
 .../serializable/SerializableTemporaryFolder.java  |   4 +-
 .../rules/serializable/SerializableTestName.java   |   6 +-
 .../rules/serializable/SerializableTimeout.java    |   4 +-
 .../geode/test/junit/runners/SuiteBlockRunner.java |   2 +-
 .../test/junit/support/DefaultIgnoreCondition.java |   1 +
 .../test/junit/rules/ExpectedTimeoutRuleTest.java  |   2 +-
 .../test/junit/rules/IgnoreUntilRuleTest.java      |   2 +-
 .../geode/test/junit/rules/RepeatRuleTest.java     |   2 +-
 .../test/junit/rules/RestoreLocaleRuleTest.java    |   2 +-
 .../junit/rules/RetryRuleGlobalWithErrorTest.java  |   4 +-
 .../rules/RetryRuleGlobalWithExceptionTest.java    |   4 +-
 .../junit/rules/RetryRuleLocalWithErrorTest.java   |   2 +-
 .../rules/RetryRuleLocalWithExceptionTest.java     |   2 +-
 .../geode/test/junit/rules/RuleListTest.java       |   7 +-
 .../test/junit/rules/TemporaryFileRuleTest.java    |   2 +-
 .../junit/rules/examples/RetryRuleExampleTest.java |   5 +-
 .../junit/rules/examples/RuleAndClassRuleTest.java |   5 +-
 .../SerializableExternalResourceTest.java          |   9 +-
 .../serializable/SerializableRuleListTest.java     |   5 +-
 .../SerializableTemporaryFolderTest.java           |  11 +-
 .../serializable/SerializableTestNameTest.java     |   9 +-
 .../serializable/SerializableTestWatcherTest.java  |   9 +-
 .../serializable/SerializableTimeoutTest.java      |  11 +-
 ...CategoryWithParameterizedRunnerFactoryTest.java |  19 +-
 .../geode/cache/lucene/FlatFormatSerializer.java   |  25 +-
 .../geode/cache/lucene/LuceneIndexFactory.java     |  12 +-
 .../geode/cache/lucene/LuceneQueryFactory.java     |   5 +-
 .../geode/cache/lucene/LuceneQueryProvider.java    |   7 +-
 .../geode/cache/lucene/LuceneResultStruct.java     |   3 +-
 .../geode/cache/lucene/LuceneSerializer.java       |  10 +-
 .../apache/geode/cache/lucene/LuceneService.java   |  29 +-
 .../geode/cache/lucene/LuceneServiceProvider.java  |   4 +-
 .../cache/lucene/PageableLuceneQueryResults.java   |   6 +-
 .../AbstractPartitionedRepositoryManager.java      |   8 +-
 .../geode/cache/lucene/internal/IndexListener.java |   5 +-
 .../lucene/internal/IndexListenerAdapter.java      |   5 +-
 .../lucene/internal/IndexRepositoryFactory.java    |  10 +-
 .../cache/lucene/internal/InternalLuceneIndex.java |   4 +-
 .../lucene/internal/InternalLuceneService.java     |   4 +-
 .../lucene/internal/LuceneBucketListener.java      |   5 +-
 .../cache/lucene/internal/LuceneEventListener.java |  15 +-
 .../internal/LuceneIndexCreationProfile.java       |  24 +-
 .../lucene/internal/LuceneIndexFactoryImpl.java    |   8 +-
 .../internal/LuceneIndexForPartitionedRegion.java  |   4 +-
 .../cache/lucene/internal/LuceneIndexImpl.java     |   4 +-
 .../lucene/internal/LuceneIndexImplFactory.java    |   4 +-
 .../lucene/internal/LuceneQueryFactoryImpl.java    |   4 +-
 .../cache/lucene/internal/LuceneQueryImpl.java     |   9 +-
 .../cache/lucene/internal/LuceneRawIndex.java      |   4 +-
 .../lucene/internal/LuceneRawIndexFactory.java     |   4 +-
 .../lucene/internal/LuceneResultStructImpl.java    |   4 +-
 .../cache/lucene/internal/LuceneServiceImpl.java   |  10 +-
 .../internal/PageableLuceneQueryResultsImpl.java   |   6 +-
 .../internal/PartitionedRepositoryManager.java     |   8 +-
 .../lucene/internal/RawIndexRepositoryFactory.java |   2 +-
 .../internal/RawLuceneRepositoryManager.java       |   2 +-
 .../cache/lucene/internal/StringQueryProvider.java |   6 +-
 .../lucene/internal/cli/LuceneIndexDetails.java    |   4 +-
 .../cli/functions/LuceneCreateIndexFunction.java   |   2 +-
 .../cli/functions/LuceneDescribeIndexFunction.java |   2 +-
 .../cli/functions/LuceneListIndexFunction.java     |   2 +-
 .../cli/functions/LuceneSearchIndexFunction.java   |   3 +-
 .../internal/directory/DumpDirectoryFiles.java     |  10 +-
 .../lucene/internal/directory/FileIndexInput.java  |   4 +-
 .../lucene/internal/directory/RegionDirectory.java |  25 +-
 .../internal/distributed/CollectorManager.java     |   8 +-
 .../lucene/internal/distributed/EntryScore.java    |   4 +-
 .../distributed/LuceneFunctionContext.java         |   6 +-
 .../internal/distributed/LuceneQueryFunction.java  |  21 +-
 .../lucene/internal/distributed/TopEntries.java    |   6 +-
 .../internal/distributed/TopEntriesCollector.java  |   4 +-
 .../distributed/TopEntriesCollectorManager.java    |   4 +-
 .../distributed/TopEntriesFunctionCollector.java   |   6 +-
 .../distributed/WaitUntilFlushedFunction.java      |   4 +-
 .../WaitUntilFlushedFunctionContext.java           |   4 +-
 .../cache/lucene/internal/filesystem/ChunkKey.java |   4 +-
 .../cache/lucene/internal/filesystem/File.java     |   6 +-
 .../internal/filesystem/FileInputStream.java       |   4 +-
 .../internal/filesystem/FileOutputStream.java      |   4 +-
 .../lucene/internal/filesystem/FileSystem.java     |   7 +-
 .../internal/filesystem/SeekableInputStream.java   |   6 +-
 .../internal/management/LuceneServiceBridge.java   |  12 +-
 .../internal/management/LuceneServiceMBean.java    |   4 +-
 .../partition/BucketTargetingFixedResolver.java    |   6 +-
 .../internal/partition/BucketTargetingMap.java     |   6 +-
 .../internal/repository/IndexRepository.java       |  22 +-
 .../internal/repository/IndexRepositoryImpl.java   |  31 +-
 .../internal/repository/IndexResultCollector.java  |   6 +-
 .../internal/repository/RepositoryManager.java     |   6 +-
 .../serializer/HeterogeneousLuceneSerializer.java  |   7 +-
 .../repository/serializer/PdxLuceneSerializer.java |  10 +-
 .../repository/serializer/PrimitiveSerializer.java |   4 +-
 .../serializer/ReflectionLuceneSerializer.java     |   5 +-
 .../repository/serializer/SerializerUtil.java      |   6 +-
 .../internal/results/LuceneGetPageFunction.java    |  20 +-
 .../internal/results/MapResultCollector.java       |   8 +-
 .../cache/lucene/internal/results/PageEntry.java   |   8 +-
 .../cache/lucene/internal/results/PageResults.java |   6 +-
 .../lucene/internal/xml/LuceneIndexCreation.java   |  18 +-
 .../internal/xml/LuceneIndexXmlGenerator.java      |  18 +-
 .../internal/xml/LuceneServiceXmlGenerator.java    |   4 +-
 .../lucene/internal/xml/LuceneXmlConstants.java    |   4 +-
 .../cache/lucene/internal/xml/LuceneXmlParser.java |  11 +-
 .../lucene/management/LuceneIndexMetrics.java      |   4 +-
 .../geode/cache/lucene/EvictionDUnitTest.java      |  29 +-
 .../geode/cache/lucene/ExpirationDUnitTest.java    |  21 +-
 .../lucene/FlatFormatPdxSerializerJunitTest.java   |  13 +-
 .../lucene/FlatFormatSerializerJUnitTest.java      |  13 +-
 .../apache/geode/cache/lucene/LocalCacheRule.java  |   7 +-
 .../lucene/LuceneCommandsSecurityDUnitTest.java    |   2 +-
 .../apache/geode/cache/lucene/LuceneDUnitTest.java |   5 +-
 .../cache/lucene/LuceneIndexCreationDUnitTest.java |  55 +-
 .../lucene/LuceneIndexCreationIntegrationTest.java |  23 +-
 .../LuceneIndexCreationOffHeapIntegrationTest.java |  17 +-
 .../LuceneIndexCreationOnFixedPRDUnitTest.java     |   9 +-
 .../cache/lucene/LuceneIndexDestroyDUnitTest.java  |  35 +-
 .../LuceneIndexMaintenanceIntegrationTest.java     |  14 +-
 .../geode/cache/lucene/LuceneIntegrationTest.java  |  10 +-
 .../cache/lucene/LuceneQueriesAccessorBase.java    |  14 +-
 .../cache/lucene/LuceneQueriesClientDUnitTest.java |   5 +-
 .../geode/cache/lucene/LuceneQueriesDUnitTest.java |  17 +-
 .../NestedObjectSeralizerIntegrationTest.java      |   9 +-
 .../geode/cache/lucene/PaginationDUnitTest.java    |  27 +-
 .../geode/cache/lucene/RebalanceDUnitTest.java     |  15 +-
 .../lucene/RebalanceWithRedundancyDUnitTest.java   |  18 +-
 .../internal/LuceneEventListenerJUnitTest.java     |  11 +-
 .../LuceneIndexCreationProfileJUnitTest.java       |  43 +-
 .../LuceneIndexForPartitionedRegionTest.java       |   1 +
 .../LuceneIndexRecoveryHAIntegrationTest.java      |  31 +-
 .../lucene/internal/LuceneIndexStatsJUnitTest.java |  10 +-
 .../internal/LuceneQueryFactoryImplJUnitTest.java  |   4 +-
 .../lucene/internal/LuceneQueryImplJUnitTest.java  |  23 +-
 .../internal/LuceneRegionListenerJUnitTest.java    |   7 +-
 .../internal/LuceneResultStructImpJUnitTest.java   |   4 +-
 .../internal/LuceneServiceImplIntegrationTest.java |  27 +-
 .../internal/LuceneServiceImplJUnitTest.java       |  11 +-
 .../PageableLuceneQueryResultsImplJUnitTest.java   |   8 +-
 .../PartitionedRepositoryManagerJUnitTest.java     |  14 +-
 .../RawLuceneRepositoryManagerJUnitTest.java       |   4 +-
 .../internal/StringQueryProviderJUnitTest.java     |   5 +-
 .../LuceneCreateIndexFunctionJUnitTest.java        |   3 +-
 .../LuceneDescribeIndexFunctionJUnitTest.java      |  14 +-
 .../LuceneSearchIndexFunctionJUnitTest.java        |   8 +-
 .../directory/DumpDirectoryFilesJUnitTest.java     |  14 +-
 .../directory/RegionDirectoryJUnitTest.java        |   7 +-
 .../distributed/DistributedScoringJUnitTest.java   |   4 +-
 .../internal/distributed/EntryScoreJUnitTest.java  |   4 +-
 .../LuceneQueryFunctionContextJUnitTest.java       |   4 +-
 .../distributed/LuceneQueryFunctionJUnitTest.java  |  27 +-
 .../distributed/TopEntriesCollectorJUnitTest.java  |   4 +-
 .../TopEntriesFunctionCollectorJUnitTest.java      |   4 +-
 .../internal/distributed/TopEntriesJUnitTest.java  |   4 +-
 .../WaitUntilFlushedFunctionJUnitTest.java         |  14 +-
 .../internal/filesystem/ChunkKeyJUnitTest.java     |   4 +-
 .../lucene/internal/filesystem/FileJUnitTest.java  |   4 +-
 .../internal/filesystem/FileSystemJUnitTest.java   |   6 +-
 .../filesystem/FileSystemStatsJUnitTest.java       |  10 +-
 .../management/LuceneManagementDUnitTest.java      |  25 +-
 .../BucketTargetingFixedResolverTest.java          |  13 +-
 .../internal/partition/BucketTargetingMapTest.java |   5 +-
 .../repository/IndexRepositoryImplJUnitTest.java   |  10 +-
 .../IndexRepositoryImplPerformanceTest.java        |   6 +-
 .../HeterogeneousLuceneSerializerJUnitTest.java    |   4 +-
 .../serializer/PdxFieldMapperJUnitTest.java        |   4 +-
 .../serializer/ReflectionFieldMapperJUnitTest.java |   4 +-
 .../serializer/SerializerTestHelper.java           |   1 +
 .../internal/repository/serializer/Type1.java      |   4 +-
 .../internal/repository/serializer/Type2.java      |   4 +-
 .../results/LuceneGetPageFunctionJUnitTest.java    |  11 +-
 .../internal/results/PageEntryJUnitTest.java       |  11 +-
 .../internal/results/PageResultsJUnitTest.java     |   9 +-
 ...uceneIndexXmlGeneratorIntegrationJUnitTest.java |  31 +-
 .../xml/LuceneIndexXmlGeneratorJUnitTest.java      |  12 +-
 .../LuceneIndexXmlParserIntegrationJUnitTest.java  |  49 +-
 .../xml/LuceneIndexXmlParserJUnitTest.java         |   4 +-
 .../cache/lucene/test/IndexRepositorySpy.java      |   8 +-
 .../test/LuceneDeclarable2TestSerializer.java      |   4 +-
 .../cache/lucene/test/LuceneTestSerializer.java    |  11 +-
 .../cache/lucene/test/LuceneTestUtilities.java     |   9 +-
 .../com/gemstone/gemfire/GemFireException.java     |   2 +-
 .../execute/EmtpyRegionFunctionException.java      |  10 +-
 .../gemfire/cache/execute/FunctionException.java   |  19 +-
 .../execute/FunctionInvocationTargetException.java |  16 +-
 .../cache/execute/FunctionExceptionTest.java       |   9 +-
 .../apache/geode/OldClientSupportDUnitTest.java    |  14 +-
 .../protocol/protobuf/EncodingTypeTranslator.java  |  68 --
 .../protocol/protobuf/ProtobufCachePipeline.java   |  60 --
 .../protocol/protobuf/ProtobufLocatorPipeline.java |  58 --
 .../protobuf/ProtobufOperationContext.java         |  39 -
 .../protocol/protobuf/ProtobufOpsProcessor.java    |  82 --
 .../protocol/protobuf/ProtobufProtocolService.java |  67 --
 .../protobuf/ProtobufSerializationService.java     |  55 --
 .../protocol/protobuf/ProtobufStreamProcessor.java |  79 --
 .../operations/GetAllRequestOperationHandler.java  | 107 ---
 .../GetAvailableServersOperationHandler.java       |  63 --
 .../GetRegionNamesRequestOperationHandler.java     |  42 -
 .../GetRegionRequestOperationHandler.java          |  59 --
 .../operations/GetRequestOperationHandler.java     |  77 --
 .../HandshakeRequestOperationHandler.java          |  63 --
 .../operations/PutAllRequestOperationHandler.java  |  96 ---
 .../operations/PutRequestOperationHandler.java     |  75 --
 .../operations/RemoveRequestOperationHandler.java  |  72 --
 .../AuthenticationRequestOperationHandler.java     |  84 --
 .../registry/ProtobufOperationContextRegistry.java | 122 ---
 .../serializer/ProtobufProtocolSerializer.java     |  43 -
 ...onnectionShiroAuthenticatingStateProcessor.java |  55 --
 .../ProtobufConnectionHandshakeStateProcessor.java |  57 --
 .../protobuf/utilities/ProtobufPrimitiveTypes.java |  49 --
 .../utilities/ProtobufRequestUtilities.java        | 118 ---
 .../utilities/ProtobufResponseUtilities.java       |  64 --
 .../protobuf/utilities/ProtobufUtilities.java      | 282 ------
 .../exception/UnknownProtobufPrimitiveType.java    |  24 -
 .../protobuf/v1/EncodingTypeTranslator.java        |  68 ++
 .../protobuf/v1/ProtobufCachePipeline.java         |  60 ++
 .../protobuf/v1/ProtobufLocatorPipeline.java       |  58 ++
 .../protobuf/v1/ProtobufOperationContext.java      |  38 +
 .../protocol/protobuf/v1/ProtobufOpsProcessor.java |  82 ++
 .../protobuf/v1/ProtobufProtocolService.java       |  67 ++
 .../protobuf/v1/ProtobufSerializationService.java  |  55 ++
 .../protobuf/v1/ProtobufStreamProcessor.java       |  79 ++
 .../operations/GetAllRequestOperationHandler.java  | 111 +++
 .../GetAvailableServersOperationHandler.java       |  63 ++
 .../GetRegionNamesRequestOperationHandler.java     |  42 +
 .../GetRegionRequestOperationHandler.java          |  59 ++
 .../v1/operations/GetRequestOperationHandler.java  |  78 ++
 .../HandshakeRequestOperationHandler.java          |  64 ++
 .../operations/PutAllRequestOperationHandler.java  |  98 +++
 .../v1/operations/PutRequestOperationHandler.java  |  77 ++
 .../operations/RemoveRequestOperationHandler.java  |  73 ++
 .../AuthenticationRequestOperationHandler.java     |  83 ++
 .../registry/ProtobufOperationContextRegistry.java | 121 +++
 .../v1/serializer/ProtobufProtocolSerializer.java  |  42 +
 ...onnectionShiroAuthenticatingStateProcessor.java |  56 ++
 .../ProtobufConnectionHandshakeStateProcessor.java |  57 ++
 .../v1/utilities/ProtobufPrimitiveTypes.java       |  49 ++
 .../v1/utilities/ProtobufRequestUtilities.java     | 118 +++
 .../v1/utilities/ProtobufResponseUtilities.java    |  64 ++
 .../protobuf/v1/utilities/ProtobufUtilities.java   | 282 ++++++
 .../exception/UnknownProtobufPrimitiveType.java    |  24 +
 geode-protobuf/src/main/proto/basicTypes.proto     |  88 --
 geode-protobuf/src/main/proto/clientProtocol.proto |  78 --
 geode-protobuf/src/main/proto/connection_API.proto |  45 -
 geode-protobuf/src/main/proto/region_API.proto     |  95 --
 geode-protobuf/src/main/proto/server_API.proto     |  32 -
 geode-protobuf/src/main/proto/v1/basicTypes.proto  |  88 ++
 .../src/main/proto/v1/clientProtocol.proto         |  78 ++
 .../src/main/proto/v1/connection_API.proto         |  45 +
 geode-protobuf/src/main/proto/v1/region_API.proto  |  95 ++
 geode-protobuf/src/main/proto/v1/server_API.proto  |  32 +
 ...nal.cache.client.protocol.ClientProtocolService |   2 +-
 .../protocol/AuthenticationIntegrationTest.java    | 349 --------
 .../protocol/AuthorizationIntegrationTest.java     | 224 -----
 .../protocol/HandshakeIntegrationTest.java         | 131 ---
 .../geode/internal/protocol/MessageUtil.java       |  74 --
 .../apache/geode/internal/protocol/OpsHandler.java |  21 -
 .../protocol/ProtobufTestExecutionContext.java     |  32 -
 .../internal/protocol/TestExecutionContext.java    |  32 +
 .../acceptance/CacheConnectionJUnitTest.java       | 285 ------
 .../CacheConnectionTimeoutJUnitTest.java           | 165 ----
 .../acceptance/CacheMaxConnectionJUnitTest.java    | 248 ------
 .../acceptance/CacheOperationsJUnitTest.java       | 406 ---------
 .../acceptance/LocatorConnectionDUnitTest.java     | 264 ------
 ...TypeToSerializationTypeTranslatorJUnitTest.java |   2 +
 .../protobuf/ProtobufProtocolServiceJUnitTest.java |  37 -
 .../protobuf/ProtobufStreamProcessorTest.java      |  17 +-
 .../GetAllRequestOperationHandlerJUnitTest.java    | 183 ----
 ...tAvailableServersOperationHandlerJUnitTest.java | 114 ---
 ...egionNamesRequestOperationHandlerJUnitTest.java | 104 ---
 .../GetRegionRequestOperationHandlerJUnitTest.java | 105 ---
 .../GetRequestOperationHandlerJUnitTest.java       | 144 ----
 .../HandshakeRequestOperationHandlerJUnitTest.java | 171 ----
 .../operations/OperationHandlerJUnitTest.java      |  38 -
 .../PutAllRequestOperationHandlerJUnitTest.java    | 135 ---
 .../PutRequestOperationHandlerJUnitTest.java       | 143 ---
 .../RemoveRequestOperationHandlerJUnitTest.java    | 131 ---
 .../utilities/ProtobufUtilitiesJUnitTest.java      | 159 ----
 .../protobuf/v1/AuthenticationIntegrationTest.java | 347 ++++++++
 .../protobuf/v1/AuthorizationIntegrationTest.java  | 223 +++++
 .../protobuf/v1/HandshakeIntegrationTest.java      | 125 +++
 .../internal/protocol/protobuf/v1/MessageUtil.java |  71 ++
 .../v1/ProtobufProtocolServiceJUnitTest.java       |  37 +
 .../v1/acceptance/CacheConnectionJUnitTest.java    | 286 ++++++
 .../CacheConnectionTimeoutJUnitTest.java           | 164 ++++
 .../v1/acceptance/CacheMaxConnectionJUnitTest.java | 249 ++++++
 .../v1/acceptance/CacheOperationsJUnitTest.java    | 407 +++++++++
 .../v1/acceptance/LocatorConnectionDUnitTest.java  | 264 ++++++
 .../GetAllRequestOperationHandlerJUnitTest.java    | 183 ++++
 ...tAvailableServersOperationHandlerJUnitTest.java | 114 +++
 ...egionNamesRequestOperationHandlerJUnitTest.java | 104 +++
 .../GetRegionRequestOperationHandlerJUnitTest.java | 105 +++
 .../GetRequestOperationHandlerJUnitTest.java       | 144 ++++
 .../HandshakeRequestOperationHandlerJUnitTest.java | 175 ++++
 .../v1/operations/OperationHandlerJUnitTest.java   |  38 +
 .../PutAllRequestOperationHandlerJUnitTest.java    | 135 +++
 .../PutRequestOperationHandlerJUnitTest.java       | 143 +++
 .../RemoveRequestOperationHandlerJUnitTest.java    | 131 +++
 .../v1/serialization/codec/JSONCodecJUnitTest.java | 231 +++++
 .../registry/CodecRegistryJUnitTest.java           |  49 ++
 .../ProtobufProtocolSerializerJUnitTest.java       |  75 ++
 .../v1/utilities/ProtobufUtilitiesJUnitTest.java   | 160 ++++
 .../ProtobufProtocolSerializerJUnitTest.java       |  75 --
 .../serialization/codec/JSONCodecJUnitTest.java    | 230 -----
 .../registry/CodecRegistryJUnitTest.java           |  49 --
 .../{ => protobuf/v1}/acceptance/default.keystore  | Bin
 .../tools/pulse/internal/PulseAppListener.java     |  14 +-
 .../controllers/ExceptionHandlingAdvice.java       |   4 +-
 .../internal/controllers/PulseController.java      |  36 +-
 .../geode/tools/pulse/internal/data/Cluster.java   |  19 +-
 .../tools/pulse/internal/data/DataBrowser.java     |  28 +-
 .../tools/pulse/internal/data/IClusterUpdater.java |   8 +-
 .../tools/pulse/internal/data/JMXDataUpdater.java  |  20 +-
 .../pulse/internal/data/JmxManagerFinder.java      |  16 +-
 .../tools/pulse/internal/data/PulseConfig.java     |   6 +-
 .../tools/pulse/internal/data/PulseVersion.java    |   4 +-
 .../tools/pulse/internal/data/Repository.java      |  12 +-
 .../internal/security/GemFireAuthentication.java   |   7 +-
 .../security/GemFireAuthenticationProvider.java    |  10 +-
 .../pulse/internal/security/LogoutHandler.java     |  12 +-
 .../internal/service/ClusterDetailsService.java    |  16 +-
 .../service/ClusterDiskThroughputService.java      |   9 +-
 .../internal/service/ClusterGCPausesService.java   |  11 +-
 .../service/ClusterKeyStatisticsService.java       |  11 +-
 .../internal/service/ClusterMemberService.java     |  24 +-
 .../service/ClusterMembersRGraphService.java       |  28 +-
 .../service/ClusterMemoryUsageService.java         |  11 +-
 .../internal/service/ClusterRegionService.java     |  22 +-
 .../internal/service/ClusterRegionsService.java    |  28 +-
 .../service/ClusterSelectedRegionService.java      |  22 +-
 .../ClusterSelectedRegionsMemberService.java       |  19 +-
 .../internal/service/ClusterWANInfoService.java    |  14 +-
 .../service/MemberAsynchEventQueuesService.java    |  11 +-
 .../internal/service/MemberClientsService.java     |  13 +-
 .../internal/service/MemberDetailsService.java     |  16 +-
 .../service/MemberDiskThroughputService.java       |  11 +-
 .../internal/service/MemberGCPausesService.java    |  11 +-
 .../internal/service/MemberGatewayHubService.java  |  18 +-
 .../internal/service/MemberHeapUsageService.java   |  11 +-
 .../service/MemberKeyStatisticsService.java        |  11 +-
 .../internal/service/MemberRegionsService.java     |  16 +-
 .../pulse/internal/service/MembersListService.java |  11 +-
 .../tools/pulse/internal/service/PulseService.java |   4 +-
 .../internal/service/PulseServiceFactory.java      |   2 +-
 .../internal/service/PulseVersionService.java      |   9 +-
 .../internal/service/QueryStatisticsService.java   |   4 +-
 .../internal/service/SystemAlertsService.java      |  13 +-
 .../tools/pulse/internal/util/ConnectionUtil.java  |   2 +-
 .../tools/pulse/internal/util/IPAddressUtil.java   |   4 +-
 .../geode/tools/pulse/internal/util/TimeUtils.java |  10 +-
 .../controllers/PulseControllerJUnitTest.java      |  12 +-
 .../tools/pulse/internal/PulseAppListenerTest.java |   3 +-
 .../data/JMXDataUpdaterGetDoubleAttributeTest.java |   5 +-
 .../pulse/testbed/GemFireDistributedSystem.java    |   8 +-
 .../tools/pulse/testbed/PropMockDataUpdater.java   |  37 +-
 .../org/apache/geode/tools/pulse/tests/Server.java |  19 +-
 .../tools/pulse/tests/junit/BaseServiceTest.java   |  19 +-
 .../junit/ClusterSelectedRegionServiceTest.java    |   3 +-
 .../ClusterSelectedRegionsMemberServiceTest.java   |   3 +-
 .../tests/junit/MemberGatewayHubServiceTest.java   |   3 +-
 .../pulse/tests/rules/ScreenshotOnFailureRule.java |   9 +-
 .../geode/tools/pulse/tests/rules/ServerRule.java  |  13 +-
 .../tools/pulse/tests/rules/WebDriverRule.java     |   4 +-
 .../pulse/tests/ui/PulseAnonymousUserTest.java     |   9 +-
 .../geode/tools/pulse/tests/ui/PulseAuthTest.java  |   9 +-
 .../tools/pulse/tests/ui/PulseAutomatedTest.java   |  10 +-
 .../geode/tools/pulse/tests/ui/PulseBase.java      |  17 +-
 .../tools/pulse/tests/ui/PulseNoAuthTest.java      |   9 +-
 .../org/apache/geode/cache/util/AutoBalancer.java  |  10 +-
 .../util/AutoBalancerIntegrationJUnitTest.java     |  35 +-
 .../client/internal/GatewaySenderBatchOp.java      |  16 +-
 .../geode/cache/client/internal/SenderProxy.java   |   2 +-
 .../internal/locator/wan/LocatorDiscovery.java     |  11 +-
 .../client/internal/locator/wan/LocatorHelper.java |  14 +-
 .../locator/wan/LocatorMembershipListenerImpl.java |  25 +-
 .../locator/wan/RemoteLocatorJoinRequest.java      |   6 +-
 .../locator/wan/RemoteLocatorJoinResponse.java     |   6 +-
 .../locator/wan/RemoteLocatorPingRequest.java      |   2 +-
 .../locator/wan/RemoteLocatorPingResponse.java     |   2 +-
 .../internal/locator/wan/RemoteLocatorRequest.java |   2 +-
 .../locator/wan/RemoteLocatorResponse.java         |   2 +-
 .../locator/wan/WanLocatorDiscovererImpl.java      |  13 +-
 .../internal/cache/wan/GatewayReceiverImpl.java    |   4 +-
 .../wan/GatewaySenderEventRemoteDispatcher.java    |   1 -
 ...currentParallelGatewaySenderEventProcessor.java |   2 +-
 .../RemoteParallelGatewaySenderEventProcessor.java |   2 +-
 .../RemoteSerialGatewaySenderEventProcessor.java   |   4 +-
 ...tewayReceiverAutoConnectionSourceDUnitTest.java |  13 +-
 .../cache/wan/WANRollingUpgradeDUnitTest.java      |  26 +-
 .../AnalyzeWANSerializablesJUnitTest.java          |   3 +-
 .../cache/wan/AckReaderThreadJUnitTest.java        |  17 +-
 .../cache/wan/Simple2CacheServerDUnitTest.java     |  17 +-
 .../geode/internal/cache/wan/WANTestBase.java      |  67 +-
 .../ConcurrentParallelGatewaySenderDUnitTest.java  |  14 +-
 ...rrentParallelGatewaySenderOffHeapDUnitTest.java |   6 +-
 ...ParallelGatewaySenderOperation_1_DUnitTest.java |  21 +-
 ...ParallelGatewaySenderOperation_2_DUnitTest.java |  15 +-
 ...rentSerialGatewaySenderOperationsDUnitTest.java |  13 +-
 ...ialGatewaySenderOperationsOffHeapDUnitTest.java |   6 +-
 .../ConcurrentWANPropagation_1_DUnitTest.java      |  22 +-
 .../ConcurrentWANPropagation_2_DUnitTest.java      |  13 +-
 .../misc/CommonParallelGatewaySenderDUnitTest.java |  19 +-
 ...ommonParallelGatewaySenderOffHeapDUnitTest.java |   6 +-
 .../NewWANConcurrencyCheckForDestroyDUnitTest.java |  13 +-
 .../wan/misc/NewWanAuthenticationDUnitTest.java    |   4 +-
 .../cache/wan/misc/PDXNewWanDUnitTest.java         |  16 +-
 ...atedRegion_ParallelWANPersistenceDUnitTest.java |   9 +-
 ...atedRegion_ParallelWANPropagationDUnitTest.java |  11 +-
 .../cache/wan/misc/WANConfigurationJUnitTest.java  |  29 +-
 .../internal/cache/wan/misc/WANSSLDUnitTest.java   |  11 +-
 .../cache/wan/misc/WanAutoDiscoveryDUnitTest.java  |  23 +-
 .../cache/wan/misc/WanValidationsDUnitTest.java    |  31 +-
 ...lGatewaySenderOperation_2_OffHeapDUnitTest.java |   9 +-
 ...lGatewaySenderOperation_2_OffHeapDUnitTest.java |   9 +-
 ...lelGatewaySenderOperationsOffHeapDUnitTest.java |   9 +-
 ...GatewaySenderQueueOverflowOffHeapDUnitTest.java |   9 +-
 .../ParallelWANConflationOffHeapDUnitTest.java     |   9 +-
 ...stenceEnabledGatewaySenderOffHeapDUnitTest.java |   9 +-
 ...ANPropagationConcurrentOpsOffHeapDUnitTest.java |   9 +-
 .../ParallelWANPropagationOffHeapDUnitTest.java    |   9 +-
 .../SerialGatewaySenderQueueOffHeapDUnitTest.java  |   9 +-
 ...stenceEnabledGatewaySenderOffHeapDUnitTest.java |   9 +-
 .../SerialWANPropagationOffHeapDUnitTest.java      |   3 +-
 ...pagation_PartitionedRegionOffHeapDUnitTest.java |   3 +-
 ...ParallelGatewaySenderOperation_2_DUnitTest.java |  11 +-
 .../ParallelGatewaySenderOperationsDUnitTest.java  |   2 +-
 ...arallelGatewaySenderQueueOverflowDUnitTest.java |   2 +-
 .../parallel/ParallelWANConflationDUnitTest.java   |  17 +-
 ...ANPersistenceEnabledGatewaySenderDUnitTest.java |  19 +-
 ...rallelWANPropagationConcurrentOpsDUnitTest.java |  17 +-
 .../parallel/ParallelWANPropagationDUnitTest.java  |  27 +-
 .../ParallelWANPropagationLoopBackDUnitTest.java   |  11 +-
 .../wan/parallel/ParallelWANStatsDUnitTest.java    |  18 +-
 ...lGatewaySenderDistributedDeadlockDUnitTest.java |  11 +-
 .../SerialGatewaySenderEventListenerDUnitTest.java |  12 +-
 .../SerialGatewaySenderOperationsDUnitTest.java    |  21 +-
 .../serial/SerialGatewaySenderQueueDUnitTest.java  |   2 +-
 ...ANPersistenceEnabledGatewaySenderDUnitTest.java |  19 +-
 .../wan/serial/SerialWANPropagationDUnitTest.java  |  12 +-
 .../SerialWANPropagationLoopBackDUnitTest.java     |  11 +-
 ...lWANPropagation_PartitionedRegionDUnitTest.java |  11 +-
 .../SerialWANPropagationsFeatureDUnitTest.java     |   9 +-
 .../cache/wan/serial/SerialWANStatsDUnitTest.java  |  24 +-
 ...teAndDestroyGatewaySenderCommandsDUnitTest.java |  12 +-
 .../CreateGatewayReceiverCommandDUnitTest.java     |   8 +-
 .../CreateGatewaySenderCommandDUnitTest.java       |   6 +-
 .../DestroyGatewaySenderCommandDUnitTest.java      |   6 +-
 .../PauseGatewaySenderCommandDUnitTest.java        |   6 +-
 .../ResumeGatewaySenderCommandDUnitTest.java       |  12 +-
 .../StartGatewayReceiverCommandDUnitTest.java      |  10 +-
 .../StartGatewaySenderCommandDUnitTest.java        |   6 +-
 .../StatusGatewayReceiverCommandDUnitTest.java     |   6 +-
 .../StatusGatewaySenderCommandDUnitTest.java       |   6 +-
 .../StopGatewayReceiverCommandDUnitTest.java       |   8 +-
 .../StopGatewaySenderCommandDUnitTest.java         |   6 +-
 .../cache/wan/wancommand/WANCommandUtils.java      |   5 +-
 .../wan/wancommand/WanCommandListDUnitTest.java    |   6 +-
 .../geode/management/WANManagementDUnitTest.java   |  20 +-
 ...rConfigurationIndexWithFromClauseDUnitTest.java |   2 +-
 .../WANClusterConfigurationDUnitTest.java          |   7 +-
 .../internal/pulse/TestRemoteClusterDUnitTest.java |  14 +-
 .../web/controllers/AbstractBaseController.java    |  62 +-
 .../web/controllers/BaseControllerAdvice.java      |  16 +-
 .../web/controllers/FunctionAccessController.java  |   6 +-
 .../web/controllers/PdxBasedCrudController.java    |   8 +-
 .../web/controllers/QueryAccessController.java     |  12 +-
 .../web/controllers/support/QueryResultTypes.java  |   2 +-
 .../web/controllers/support/RegionData.java        |  22 +-
 .../web/controllers/support/RegionEntryData.java   |   9 +-
 .../internal/web/controllers/support/UpdateOp.java |   1 -
 .../exception/DataTypeNotSupportedException.java   |   7 +-
 .../web/exception/GemfireRestException.java        |   6 +-
 .../web/exception/MalformedJsonException.java      |   2 +-
 .../web/exception/RegionNotFoundException.java     |   2 +-
 .../web/exception/ResourceNotFoundException.java   |   2 +-
 .../CustomMappingJackson2HttpMessageConverter.java |   2 +-
 .../web/security/GeodeAuthenticationProvider.java  |  15 +-
 .../internal/web/security/RestSecurityService.java |   4 +-
 .../internal/web/swagger/config/SwaggerConfig.java |   3 +-
 .../geode/rest/internal/web/util/ArrayUtils.java   |   2 +-
 .../rest/internal/web/util/DateTimeUtils.java      |   3 +-
 .../rest/internal/web/util/IdentifiableUtils.java  |   2 +-
 .../geode/rest/internal/web/util/JsonWriter.java   |  27 +-
 .../geode/rest/internal/web/util/NumberUtils.java  |   4 +-
 .../rest/internal/web/util/ValidationUtils.java    |   3 +-
 .../AbstractBaseControllerJUnitTest.java           |   5 +-
 .../web/controllers/support/RegionDataTest.java    |   3 +-
 .../cli/commands/AlterRuntimeCommandDUnitTest.java |   2 +-
 .../commands/ClusterConfigurationDUnitTest.java    |   4 +-
 .../internal/cli/commands/CommandOverHttpTest.java |   4 +-
 .../commands/ConnectCommandIntegrationTest.java    |   2 +-
 .../cli/commands/ConnectCommandWithSSLTest.java    |   2 +-
 .../commands/ConnectCommandWithSecurityTest.java   |   2 +-
 .../commands/DescribeConfigCommandDUnitTest.java   |   2 +-
 ...xecuteFunctionCommandWithSecurityDUnitTest.java |   2 +-
 .../cli/commands/ExportConfigCommandDUnitTest.java |   3 +-
 .../ExportLogsOverHttpIntegrationTest.java         |   7 +-
 .../commands/ExportLogsStatsOverHttpDUnitTest.java |  15 +-
 .../ListIndexCommandOverHttpDUnitTest.java         |   3 +-
 .../security/GfshCommandsOverHttpSecurityTest.java |   2 +-
 .../internal/security/LogNoPasswordTest.java       |   2 +-
 .../support/LoginHandlerInterceptorJUnitTest.java  |   2 +-
 ...inHandlerInterceptorRequestHeaderJUnitTest.java |   9 +-
 .../web/domain/QueryParameterSourceJUnitTest.java  |   8 +-
 ...lizableObjectHttpMessageConverterJUnitTest.java |   2 +-
 .../HttpOperationInvokerMBeanOperationTest.java    |   2 +-
 .../shell/HttpOperationInvokerSecurityTest.java    |   2 +-
 .../internal/web/util/ConvertUtilsJUnitTest.java   |  10 +-
 4513 files changed, 32518 insertions(+), 32341 deletions(-)
 create mode 100644 geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/serializer/ProtocolSerializer.java
 delete mode 100644 geode-client-protocol/src/main/java/org/apache/geode/internal/protocol/serializer/ProtocolSerializer.java
 create mode 100644 geode-core/src/main/java/org/apache/geode/internal/VersionDescription.java
 create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/VersionCommandJUnitTest.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/EncodingTypeTranslator.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufCachePipeline.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufLocatorPipeline.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufOperationContext.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufOpsProcessor.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufProtocolService.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufSerializationService.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/ProtobufStreamProcessor.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetAllRequestOperationHandler.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionRequestOperationHandler.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/GetRequestOperationHandler.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/HandshakeRequestOperationHandler.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/PutAllRequestOperationHandler.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/PutRequestOperationHandler.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/RemoveRequestOperationHandler.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/operations/security/AuthenticationRequestOperationHandler.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/registry/ProtobufOperationContextRegistry.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/serializer/ProtobufProtocolSerializer.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/state/ConnectionShiroAuthenticatingStateProcessor.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/state/ProtobufConnectionHandshakeStateProcessor.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/utilities/ProtobufPrimitiveTypes.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/utilities/ProtobufRequestUtilities.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/utilities/ProtobufResponseUtilities.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/utilities/ProtobufUtilities.java
 delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/utilities/exception/UnknownProtobufPrimitiveType.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/EncodingTypeTranslator.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufCachePipeline.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufLocatorPipeline.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufOperationContext.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufOpsProcessor.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufProtocolService.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufSerializationService.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufStreamProcessor.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAllRequestOperationHandler.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAvailableServersOperationHandler.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRegionNamesRequestOperationHandler.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRegionRequestOperationHandler.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRequestOperationHandler.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/operations/HandshakeRequestOperationHandler.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutAllRequestOperationHandler.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutRequestOperationHandler.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/operations/RemoveRequestOperationHandler.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/operations/security/AuthenticationRequestOperationHandler.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/registry/ProtobufOperationContextRegistry.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/serializer/ProtobufProtocolSerializer.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/state/ConnectionShiroAuthenticatingStateProcessor.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/state/ProtobufConnectionHandshakeStateProcessor.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/utilities/ProtobufPrimitiveTypes.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/utilities/ProtobufRequestUtilities.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/utilities/ProtobufResponseUtilities.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/utilities/ProtobufUtilities.java
 create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/utilities/exception/UnknownProtobufPrimitiveType.java
 delete mode 100644 geode-protobuf/src/main/proto/basicTypes.proto
 delete mode 100644 geode-protobuf/src/main/proto/clientProtocol.proto
 delete mode 100644 geode-protobuf/src/main/proto/connection_API.proto
 delete mode 100644 geode-protobuf/src/main/proto/region_API.proto
 delete mode 100644 geode-protobuf/src/main/proto/server_API.proto
 create mode 100644 geode-protobuf/src/main/proto/v1/basicTypes.proto
 create mode 100644 geode-protobuf/src/main/proto/v1/clientProtocol.proto
 create mode 100644 geode-protobuf/src/main/proto/v1/connection_API.proto
 create mode 100644 geode-protobuf/src/main/proto/v1/region_API.proto
 create mode 100644 geode-protobuf/src/main/proto/v1/server_API.proto
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/AuthenticationIntegrationTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/AuthorizationIntegrationTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/HandshakeIntegrationTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/MessageUtil.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/OpsHandler.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/ProtobufTestExecutionContext.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/TestExecutionContext.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheConnectionJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheConnectionTimeoutJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheMaxConnectionJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/CacheOperationsJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/acceptance/LocatorConnectionDUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/ProtobufProtocolServiceJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/HandshakeRequestOperationHandlerJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/OperationHandlerJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/utilities/ProtobufUtilitiesJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthenticationIntegrationTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthorizationIntegrationTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/HandshakeIntegrationTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/MessageUtil.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufProtocolServiceJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheOperationsJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionDUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAllRequestOperationHandlerJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAvailableServersOperationHandlerJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRegionRequestOperationHandlerJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRequestOperationHandlerJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/HandshakeRequestOperationHandlerJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/OperationHandlerJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutAllRequestOperationHandlerJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutRequestOperationHandlerJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/RemoveRequestOperationHandlerJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/serialization/codec/JSONCodecJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/serialization/registry/CodecRegistryJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/serializer/ProtobufProtocolSerializerJUnitTest.java
 create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/utilities/ProtobufUtilitiesJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/serialization/codec/JSONCodecJUnitTest.java
 delete mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/serialization/registry/CodecRegistryJUnitTest.java
 rename geode-protobuf/src/test/resources/org/apache/geode/internal/protocol/{ => protobuf/v1}/acceptance/default.keystore (100%)

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].

[geode] 01/01: GEODE-3930: Create lucene index on an existing region

Posted by la...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ladyvader pushed a commit to branch feature/GEODE-3930
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 779c89a52cd0e0f210b3dcda6a1419776d0ed072
Author: Dan Smith <up...@apache.org>
AuthorDate: Wed Nov 1 17:09:57 2017 -0700

    GEODE-3930: Create lucene index on an existing region
    
    - This is currently just an internal method to create the index on an existing
    region.  It does not actually index the existing data in the region.
    - Adding a parameter to LuceneIndexFactoryImpl.create to allow creation on
    an existing region.
---
 .../geode/internal/cache/AbstractRegion.java       |   8 +-
 .../geode/internal/cache/InternalRegion.java       |   3 +
 .../apache/geode/internal/cache/LocalRegion.java   |  16 ++-
 .../geode/internal/cache/PartitionedRegion.java    |  12 ++-
 .../internal/cache/AbstractRegionJUnitTest.java    |   5 +
 .../lucene/internal/LuceneIndexFactoryImpl.java    |  19 ++--
 .../cache/lucene/internal/LuceneIndexImpl.java     |   2 +
 .../lucene/internal/LuceneRegionListener.java      |  23 +----
 .../cache/lucene/internal/LuceneServiceImpl.java   |  71 ++++++++++++--
 .../lucene/internal/xml/LuceneIndexCreation.java   |   9 +-
 .../cache/lucene/LuceneIndexCreationDUnitTest.java | 109 ++++++++++++++++++++-
 .../lucene/LuceneIndexCreationIntegrationTest.java |  39 ++++++++
 .../internal/LuceneIndexFactoryImplJUnitTest.java  |   4 +-
 .../internal/LuceneServiceImplJUnitTest.java       |   5 +-
 14 files changed, 269 insertions(+), 56 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
index 542157e..3ffc7e1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
@@ -869,8 +869,14 @@ public abstract class AbstractRegion implements InternalRegion, AttributesMutato
 
   @Override
   public void addAsyncEventQueueId(String asyncEventQueueId) {
+    addAsyncEventQueueId(asyncEventQueueId, false);
+  }
+
+  public void addAsyncEventQueueId(String asyncEventQueueId, boolean isInternal) {
     getAsyncEventQueueIds().add(asyncEventQueueId);
-    getVisibleAsyncEventQueueIds().add(asyncEventQueueId);
+    if (!isInternal) {
+      getVisibleAsyncEventQueueIds().add(asyncEventQueueId);
+    }
     setAllGatewaySenderIds();
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java
index 1b7c1b0..9dcd82b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java
@@ -110,4 +110,7 @@ public interface InternalRegion<K, V>
 
   void invokeInvalidateCallbacks(final EnumListenerEvent eventType, final EntryEventImpl event,
       final boolean callDispatchListenerEvent);
+
+  void addCacheServiceProfile(CacheServiceProfile profile);
+
 }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 16e4cef..bed336a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -217,6 +217,7 @@ import org.apache.geode.internal.offheap.annotations.Released;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
 import org.apache.geode.internal.sequencelog.EntryLogger;
+import org.apache.geode.internal.util.concurrent.CopyOnWriteHashMap;
 import org.apache.geode.internal.util.concurrent.FutureResult;
 import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch;
 import org.apache.geode.internal.util.concurrent.StoppableReadWriteLock;
@@ -542,7 +543,8 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
     return this.stopper;
   }
 
-  Map<String, CacheServiceProfile> cacheServiceProfiles;
+  private final CopyOnWriteHashMap<String, CacheServiceProfile> cacheServiceProfiles =
+      new CopyOnWriteHashMap<>();
 
   private static String calcFullPath(String regionName, LocalRegion parentRegion) {
     StringBuilder buf = null;
@@ -635,9 +637,9 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
     this.isUsedForParallelGatewaySenderQueue =
         internalRegionArgs.isUsedForParallelGatewaySenderQueue();
     this.serialGatewaySender = internalRegionArgs.getSerialGatewaySender();
-    this.cacheServiceProfiles =
-        internalRegionArgs.getCacheServiceProfiles() == null ? Collections.emptyMap()
-            : Collections.unmodifiableMap(internalRegionArgs.getCacheServiceProfiles());
+    if (internalRegionArgs.getCacheServiceProfiles() != null) {
+      this.cacheServiceProfiles.putAll(internalRegionArgs.getCacheServiceProfiles());
+    }
 
     if (!isUsedForMetaRegion && !isUsedForPartitionedRegionAdmin
         && !isUsedForPartitionedRegionBucket && !isUsedForSerialGatewaySenderQueue
@@ -10400,7 +10402,11 @@ public class LocalRegion extends AbstractRegion implements InternalRegion, Loade
   }
 
   Map<String, CacheServiceProfile> getCacheServiceProfiles() {
-    return Collections.unmodifiableMap(this.cacheServiceProfiles);
+    return this.cacheServiceProfiles.getSnapshot();
+  }
+
+  public void addCacheServiceProfile(CacheServiceProfile profile) {
+    this.cacheServiceProfiles.put(profile.getId(), profile);
   }
 
   @Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 1dfd34f..6e0c0cd 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -1218,7 +1218,11 @@ public class PartitionedRegion extends LocalRegion
   }
 
   public void addAsyncEventQueueId(String asyncEventQueueId) {
-    super.addAsyncEventQueueId(asyncEventQueueId);
+    addAsyncEventQueueId(asyncEventQueueId, false);
+  }
+
+  public void addAsyncEventQueueId(String asyncEventQueueId, boolean isInternal) {
+    super.addAsyncEventQueueId(asyncEventQueueId, isInternal);
     new UpdateAttributesProcessor(this).distribute();
     ((PartitionedRegion) this).distributeUpdatedProfileOnSenderCreation();
     GatewaySender sender = getCache()
@@ -4966,10 +4970,8 @@ public class PartitionedRegion extends LocalRegion
 
     fillInProfile((PartitionProfile) profile);
 
-    if (cacheServiceProfiles != null) {
-      for (CacheServiceProfile csp : cacheServiceProfiles.values()) {
-        profile.addCacheServiceProfile(csp);
-      }
+    for (CacheServiceProfile csp : getCacheServiceProfiles().values()) {
+      profile.addCacheServiceProfile(csp);
     }
 
     profile.isOffHeap = getOffHeap();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java
index da5c7b0..de50c2c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java
@@ -657,5 +657,10 @@ public class AbstractRegionJUnitTest {
     public boolean supportsConcurrencyChecks() {
       throw new UnsupportedOperationException();
     }
+
+    @Override
+    public void addCacheServiceProfile(CacheServiceProfile profile) {
+      throw new UnsupportedOperationException();
+    }
   }
 }
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java
index 1e37d11..45d4fe1 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java
@@ -23,7 +23,7 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.geode.cache.lucene.LuceneIndexFactory;
 import org.apache.geode.cache.lucene.LuceneSerializer;
 
-public class LuceneIndexFactoryImpl implements org.apache.geode.cache.lucene.LuceneIndexFactory {
+public class LuceneIndexFactoryImpl implements LuceneIndexFactory {
   private final LuceneServiceImpl service;
   private final Map<String, Analyzer> fields = new LinkedHashMap<String, Analyzer>();
   private LuceneSerializer serializer;
@@ -34,12 +34,12 @@ public class LuceneIndexFactoryImpl implements org.apache.geode.cache.lucene.Luc
   }
 
   @Override
-  public LuceneIndexFactory addField(final String name) {
+  public LuceneIndexFactoryImpl addField(final String name) {
     return addField(name, new StandardAnalyzer());
   }
 
   @Override
-  public LuceneIndexFactory setFields(final String... fields) {
+  public LuceneIndexFactoryImpl setFields(final String... fields) {
     this.fields.clear();
     for (String field : fields) {
       addField(field);
@@ -48,13 +48,13 @@ public class LuceneIndexFactoryImpl implements org.apache.geode.cache.lucene.Luc
   }
 
   @Override
-  public LuceneIndexFactory addField(final String name, final Analyzer analyzer) {
+  public LuceneIndexFactoryImpl addField(final String name, final Analyzer analyzer) {
     fields.put(name, analyzer);
     return this;
   }
 
   @Override
-  public LuceneIndexFactory setFields(final Map<String, Analyzer> fieldMap) {
+  public LuceneIndexFactoryImpl setFields(final Map<String, Analyzer> fieldMap) {
     this.fields.clear();
     this.fields.putAll(fieldMap);
     return this;
@@ -62,11 +62,16 @@ public class LuceneIndexFactoryImpl implements org.apache.geode.cache.lucene.Luc
 
   @Override
   public void create(final String indexName, final String regionPath) {
-    service.createIndex(indexName, regionPath, fields, serializer);
+    this.create(indexName, regionPath, false);
+  }
+
+  public void create(final String indexName, final String regionPath,
+      boolean allowOnExistingRegion) {
+    service.createIndex(indexName, regionPath, fields, serializer, allowOnExistingRegion);
   }
 
   @Override
-  public LuceneIndexFactory setLuceneSerializer(LuceneSerializer luceneSerializer) {
+  public LuceneIndexFactoryImpl setLuceneSerializer(LuceneSerializer luceneSerializer) {
     this.serializer = luceneSerializer;
     return this;
   }
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
index 62c82df..fd4d060 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
@@ -24,6 +24,8 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.geode.InternalGemFireError;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.EvictionAlgorithm;
+import org.apache.geode.cache.EvictionAttributes;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRegionListener.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRegionListener.java
index df9dca0..bec0dd2 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRegionListener.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRegionListener.java
@@ -20,8 +20,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.lucene.analysis.Analyzer;
 
 import org.apache.geode.cache.AttributesFactory;
-import org.apache.geode.cache.EvictionAlgorithm;
-import org.apache.geode.cache.EvictionAttributes;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueImpl;
@@ -83,21 +81,7 @@ public class LuceneRegionListener implements RegionListener {
 
     if (path.equals(this.regionPath) && this.beforeCreateInvoked.compareAndSet(false, true)) {
 
-      if (!attrs.getDataPolicy().withPartitioning()) {
-        // replicated region
-        throw new UnsupportedOperationException(
-            "Lucene indexes on replicated regions are not supported");
-      }
-
-      // For now we cannot support eviction with local destroy.
-      // Eviction with overflow to disk still needs to be supported
-      EvictionAttributes evictionAttributes = attrs.getEvictionAttributes();
-      EvictionAlgorithm evictionAlgorithm = evictionAttributes.getAlgorithm();
-      if (evictionAlgorithm != EvictionAlgorithm.NONE
-          && evictionAttributes.getAction().isLocalDestroy()) {
-        throw new UnsupportedOperationException(
-            "Lucene indexes on regions with eviction and action local destroy are not supported");
-      }
+      LuceneServiceImpl.validateRegionAttributes(attrs);
 
       String aeqId = LuceneServiceImpl.getUniqueIndexName(this.indexName, this.regionPath);
       if (!attrs.getAsyncEventQueueIds().contains(aeqId)) {
@@ -124,11 +108,6 @@ public class LuceneRegionListener implements RegionListener {
     if (region.getFullPath().equals(this.regionPath)
         && this.afterCreateInvoked.compareAndSet(false, true)) {
       this.service.afterDataRegionCreated(this.luceneIndex);
-      String aeqId = LuceneServiceImpl.getUniqueIndexName(this.indexName, this.regionPath);
-      AsyncEventQueueImpl aeq = (AsyncEventQueueImpl) cache.getAsyncEventQueue(aeqId);
-      AbstractPartitionedRepositoryManager repositoryManager =
-          (AbstractPartitionedRepositoryManager) luceneIndex.getRepositoryManager();
-      repositoryManager.allowRepositoryComputation();
     }
   }
 
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
index ec043cc..1434300 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
@@ -32,7 +32,10 @@ import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 
+import org.apache.geode.cache.AttributesFactory;
 import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.EvictionAlgorithm;
+import org.apache.geode.cache.EvictionAttributes;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueImpl;
@@ -63,6 +66,8 @@ import org.apache.geode.internal.DSFIDFactory;
 import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.cache.CacheService;
 import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.InternalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.RegionListener;
 import org.apache.geode.internal.cache.extension.Extensible;
 import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
@@ -202,20 +207,21 @@ public class LuceneServiceImpl implements InternalLuceneService {
   }
 
   public void createIndex(String indexName, String regionPath, Map<String, Analyzer> fieldAnalyzers,
-      LuceneSerializer serializer) {
+      LuceneSerializer serializer, boolean allowOnExistingRegion) {
     if (fieldAnalyzers == null || fieldAnalyzers.isEmpty()) {
       throw new IllegalArgumentException("At least one field must be indexed");
     }
     Analyzer analyzer = new PerFieldAnalyzerWrapper(new StandardAnalyzer(), fieldAnalyzers);
     Set<String> fieldsSet = fieldAnalyzers.keySet();
-    String[] fields = (String[]) fieldsSet.toArray(new String[fieldsSet.size()]);
+    String[] fields = fieldsSet.toArray(new String[fieldsSet.size()]);
 
-    createIndex(indexName, regionPath, analyzer, fieldAnalyzers, serializer, fields);
+    createIndex(indexName, regionPath, analyzer, fieldAnalyzers, serializer, allowOnExistingRegion,
+        fields);
   }
 
   public void createIndex(final String indexName, String regionPath, final Analyzer analyzer,
       final Map<String, Analyzer> fieldAnalyzers, final LuceneSerializer serializer,
-      final String... fields) {
+      boolean allowOnExistingRegion, final String... fields) {
 
     if (!regionPath.startsWith("/")) {
       regionPath = "/" + regionPath;
@@ -224,14 +230,59 @@ public class LuceneServiceImpl implements InternalLuceneService {
     registerDefinedIndex(indexName, regionPath, new LuceneIndexCreationProfile(indexName,
         regionPath, fields, analyzer, fieldAnalyzers, serializer));
 
-    Region region = cache.getRegion(regionPath);
-    if (region != null) {
+    PartitionedRegion region = (PartitionedRegion) cache.getRegion(regionPath);
+
+    LuceneRegionListener regionListener = new LuceneRegionListener(this, cache, indexName,
+        regionPath, fields, analyzer, fieldAnalyzers, serializer);
+    if (region == null) {
+      cache.addRegionListener(regionListener);
+      return;
+    }
+
+    if (!allowOnExistingRegion) {
       definedIndexMap.remove(LuceneServiceImpl.getUniqueIndexName(indexName, regionPath));
       throw new IllegalStateException("The lucene index must be created before region");
     }
 
-    cache.addRegionListener(new LuceneRegionListener(this, cache, indexName, regionPath, fields,
+
+    createIndexOnExistingRegion(region, indexName, regionPath, fields, analyzer, fieldAnalyzers,
+        serializer);
+
+  }
+
+  private void createIndexOnExistingRegion(PartitionedRegion region, String indexName,
+      String regionPath, String[] fields, Analyzer analyzer, Map<String, Analyzer> fieldAnalyzers,
+      LuceneSerializer serializer) {
+    validateRegionAttributes(region.getAttributes());
+
+    String aeqId = LuceneServiceImpl.getUniqueIndexName(indexName, regionPath);
+    region.addAsyncEventQueueId(aeqId, true);
+
+    region.addCacheServiceProfile(new LuceneIndexCreationProfile(indexName, regionPath, fields,
         analyzer, fieldAnalyzers, serializer));
+
+    LuceneIndexImpl luceneIndex = beforeDataRegionCreated(indexName, regionPath,
+        region.getAttributes(), analyzer, fieldAnalyzers, aeqId, serializer, fields);
+
+    afterDataRegionCreated(luceneIndex);
+  }
+
+  static void validateRegionAttributes(RegionAttributes attrs) {
+    if (!attrs.getDataPolicy().withPartitioning()) {
+      // replicated region
+      throw new UnsupportedOperationException(
+          "Lucene indexes on replicated regions are not supported");
+    }
+
+    // For now we cannot support eviction with local destroy.
+    // Eviction with overflow to disk still needs to be supported
+    EvictionAttributes evictionAttributes = attrs.getEvictionAttributes();
+    EvictionAlgorithm evictionAlgorithm = evictionAttributes.getAlgorithm();
+    if (evictionAlgorithm != EvictionAlgorithm.NONE
+        && evictionAttributes.getAction().isLocalDestroy()) {
+      throw new UnsupportedOperationException(
+          "Lucene indexes on regions with eviction and action local destroy are not supported");
+    }
   }
 
   /**
@@ -246,6 +297,12 @@ public class LuceneServiceImpl implements InternalLuceneService {
       this.managementListener.afterIndexCreated(index);
     }
 
+    String aeqId = LuceneServiceImpl.getUniqueIndexName(index.getName(), index.getRegionPath());
+    AsyncEventQueueImpl aeq = (AsyncEventQueueImpl) cache.getAsyncEventQueue(aeqId);
+    AbstractPartitionedRepositoryManager repositoryManager =
+        (AbstractPartitionedRepositoryManager) index.getRepositoryManager();
+    repositoryManager.allowRepositoryComputation();
+
   }
 
   public LuceneIndexImpl beforeDataRegionCreated(final String indexName, final String regionPath,
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexCreation.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexCreation.java
index bf171a1..d781c05 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexCreation.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexCreation.java
@@ -15,7 +15,11 @@
 
 package org.apache.geode.cache.lucene.internal.xml;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.analysis.Analyzer;
@@ -23,7 +27,6 @@ import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 
 import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.Declarable;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.lucene.LuceneIndex;
 import org.apache.geode.cache.lucene.LuceneIndexExistsException;
@@ -100,7 +103,7 @@ public class LuceneIndexCreation implements LuceneIndex, Extension<Region<?, ?>>
         : new PerFieldAnalyzerWrapper(new StandardAnalyzer(), this.fieldAnalyzers);
     try {
       service.createIndex(getName(), getRegionPath(), analyzer, this.fieldAnalyzers,
-          getLuceneSerializer(), getFieldNames());
+          getLuceneSerializer(), false, getFieldNames());
     } catch (LuceneIndexExistsException e) {
       logger
           .info(LocalizedStrings.LuceneIndexCreation_IGNORING_DUPLICATE_INDEX_CREATION_0_ON_REGION_1
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java
index 9328ede..2f9eb57 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java
@@ -15,26 +15,47 @@
 package org.apache.geode.cache.lucene;
 
 import static junitparams.JUnitParamsRunner.$;
-import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_ANALYZERS;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_ANALYZERS_2;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_FIELDS;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_FIELDS_2;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_INDEXES_1;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_INDEXES_2;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_INDEXES_3;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_NAMES;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_SERIALIZER;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.INDEX_NAME;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.REGION_NAME;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.core.KeywordAnalyzer;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.hamcrest.Matchers;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.lucene.internal.LuceneIndexFactoryImpl;
 import org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
 import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
+import org.apache.geode.cache.lucene.test.TestObject;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.dunit.SerializableRunnableIF;
 import org.apache.geode.test.junit.categories.DistributedTest;
@@ -44,6 +65,9 @@ import org.apache.geode.util.test.TestUtil;
 @RunWith(JUnitParamsRunner.class)
 public class LuceneIndexCreationDUnitTest extends LuceneDUnitTest {
 
+  @Rule
+  public transient ExpectedException expectedException = ExpectedException.none();
+
   private Object[] parametersForMultipleIndexCreates() {
     Integer[] numIndexes = {1, 2, 10};
     RegionTestableType[] regionTestTypes = getListOfRegionTestTypes();
@@ -249,6 +273,67 @@ public class LuceneIndexCreationDUnitTest extends LuceneDUnitTest {
     dataStore2.invoke(() -> initDataStore(createIndex, regionType));
   }
 
+  @Test
+  @Parameters({"PARTITION", "PARTITION_REDUNDANT"})
+  public void creatingIndexAfterRegionAndStartingUpSecondMemberSucceeds(
+      RegionTestableType regionType) {
+    dataStore1.invoke(() -> {
+      regionType.createDataStore(getCache(), REGION_NAME);
+      createIndexAfterRegion("field1");
+    });
+
+    dataStore2.invoke(() -> {
+      createIndexAfterRegion("field1");
+      regionType.createDataStore(getCache(), REGION_NAME);
+    });
+    dataStore1.invoke(() -> {
+      putEntryAndQuery();
+    });
+  }
+
+  @Test()
+  @Parameters({"PARTITION", "PARTITION_REDUNDANT"})
+  public void creatingIndexAfterRegionAndStartingUpSecondMemberWithoutIndexFails(
+      RegionTestableType regionType) {
+    dataStore1.invoke(() -> {
+      regionType.createDataStore(getCache(), REGION_NAME);
+      createIndexAfterRegion("field1");
+    });
+
+    expectedException.expectCause(Matchers.instanceOf(IllegalStateException.class));
+    dataStore2.invoke(() -> {
+      regionType.createDataStore(getCache(), REGION_NAME);
+      createIndexAfterRegion("field1");
+    });
+
+    dataStore1.invoke(() -> {
+      putEntryAndQuery();
+    });
+  }
+
+  @Test
+  @Parameters({"PARTITION", "PARTITION_REDUNDANT"})
+  public void creatingIndexAfterRegionInTwoMembersSucceed(RegionTestableType regionType) {
+    dataStore1.invoke(() -> {
+      regionType.createDataStore(getCache(), REGION_NAME);
+    });
+
+    dataStore2.invoke(() -> {
+      regionType.createDataStore(getCache(), REGION_NAME);
+    });
+
+    dataStore1.invoke(() -> {
+      createIndexAfterRegion("field1");
+    });
+
+    dataStore2.invoke(() -> {
+      createIndexAfterRegion("field1");
+    });
+
+    dataStore1.invoke(() -> {
+      putEntryAndQuery();
+    });
+  }
 
   @Test
   @Parameters(method = "getXmlAndExceptionMessages")
@@ -545,4 +630,24 @@ public class LuceneIndexCreationDUnitTest extends LuceneDUnitTest {
   protected void verifyAsyncEventQueues(final int expectedSize) {
     assertEquals(expectedSize, getCache().getAsyncEventQueues(false).size());
   }
+
+  private void createIndexAfterRegion(String... fields) {
+    LuceneService luceneService = LuceneServiceProvider.get(getCache());
+    LuceneIndexFactoryImpl indexFactory =
+        (LuceneIndexFactoryImpl) luceneService.createIndexFactory();
+    indexFactory.setFields(fields).create(INDEX_NAME, REGION_NAME, true);
+  }
+
+  private void putEntryAndQuery() throws InterruptedException, LuceneQueryException {
+    Cache cache = getCache();
+    Region region = cache.getRegion(REGION_NAME);
+    region.put("key1", new TestObject("field1Value", "field2Value"));
+    LuceneService luceneService = LuceneServiceProvider.get(cache);
+    luceneService.waitUntilFlushed(INDEX_NAME, REGION_NAME, 1, TimeUnit.MINUTES);
+    LuceneQuery<Object, Object> query = luceneService.createLuceneQueryFactory().create(INDEX_NAME,
+        REGION_NAME, "field1:field1Value", "field1");
+    assertEquals(Collections.singletonList("key1"), query.findKeys());
+  }
+
+
 }
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
index 00b96e0..8d88875 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
@@ -27,6 +27,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -50,6 +51,7 @@ import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionFactory;
 import org.apache.geode.cache.RegionShortcut;
 import org.apache.geode.cache.lucene.internal.LuceneIndexCreationProfile;
+import org.apache.geode.cache.lucene.internal.LuceneIndexFactoryImpl;
 import org.apache.geode.cache.lucene.internal.LuceneIndexImplFactory;
 import org.apache.geode.cache.lucene.internal.LuceneRawIndex;
 import org.apache.geode.cache.lucene.internal.LuceneRawIndexFactory;
@@ -183,6 +185,43 @@ public class LuceneIndexCreationIntegrationTest extends LuceneIntegrationTest {
     createIndex("field1", "field2", "field3");
   }
 
+  @Test()
+  public void canCreateLuceneIndexAfterRegionCreatedIfAllowFlagIsSet()
+      throws IOException, ParseException, InterruptedException, LuceneQueryException {
+    Region region = createRegion();
+    LuceneService luceneService = LuceneServiceProvider.get(cache);
+    final LuceneIndexFactoryImpl indexFactory =
+        (LuceneIndexFactoryImpl) luceneService.createIndexFactory();
+    indexFactory.setFields("field1", "field2").create(INDEX_NAME, REGION_NAME, true);
+
+    LuceneIndex index = luceneService.getIndex(INDEX_NAME, REGION_NAME);
+    assertNotNull(index);
+
+    region.put("key1", new TestObject("hello", "world"));
+    luceneService.waitUntilFlushed(INDEX_NAME, REGION_NAME, 1, TimeUnit.MINUTES);
+    LuceneQuery<Object, Object> query = luceneService.createLuceneQueryFactory().create(INDEX_NAME,
+        REGION_NAME, "field1:hello", "field1");
+
+    assertEquals(Collections.singletonList("key1"), query.findKeys());
+  }
+
+
+  @Test()
+  public void creatingDuplicateLuceneIndexFails()
+      throws IOException, ParseException, InterruptedException, LuceneQueryException {
+    Region region = createRegion();
+    LuceneService luceneService = LuceneServiceProvider.get(cache);
+    final LuceneIndexFactoryImpl indexFactory =
+        (LuceneIndexFactoryImpl) luceneService.createIndexFactory();
+    indexFactory.setFields("field1", "field2").create(INDEX_NAME, REGION_NAME, true);
+
+    LuceneIndex index = luceneService.getIndex(INDEX_NAME, REGION_NAME);
+    assertNotNull(index);
+
+    expectedException.expect(LuceneIndexExistsException.class);
+    indexFactory.setFields("field1", "field2").create(INDEX_NAME, REGION_NAME, true);
+  }
+
   @Test
   public void cannotCreateLuceneIndexForReplicateRegion() throws IOException, ParseException {
     try {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImplJUnitTest.java
index 67759db..bafb60a 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImplJUnitTest.java
@@ -14,7 +14,6 @@
  */
 package org.apache.geode.cache.lucene.internal;
 
-import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -37,7 +36,8 @@ public class LuceneIndexFactoryImplJUnitTest {
     LuceneIndexFactory factory = new LuceneIndexFactoryImpl(service);
     factory.setLuceneSerializer(serializer);
     factory.create("index", "region");
-    Mockito.verify(service).createIndex(eq("index"), eq("region"), any(), eq(serializer));
+    Mockito.verify(service).createIndex(eq("index"), eq("region"), any(), eq(serializer),
+        eq(false));
   }
 
 }
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplJUnitTest.java
index 57186c3..23c23cc 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplJUnitTest.java
@@ -63,7 +63,8 @@ public class LuceneServiceImplJUnitTest {
     factory.setLuceneSerializer(serializer);
     factory.setFields("field1", "field2");
     factory.create("index", "region");
-    Mockito.verify(service).createIndex(eq("index"), eq("region"), any(), eq(serializer));
+    Mockito.verify(service).createIndex(eq("index"), eq("region"), any(), eq(serializer),
+        eq(false));
   }
 
   @Test
@@ -75,7 +76,7 @@ public class LuceneServiceImplJUnitTest {
   @Test
   public void shouldThrowIllegalArgumentExceptionIfFieldsMapIsMissing() {
     thrown.expect(IllegalArgumentException.class);
-    service.createIndex("index", "region", Collections.emptyMap(), null);
+    service.createIndex("index", "region", Collections.emptyMap(), null, false);
   }
 
   @Test

-- 
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.